Merge branch 'main' of gitlab.33.cn:HF_web/NFT

src/components/common/Cell.vue

@@ -8,7 +8,7 @@
     "
   >
     <div class="left flex items-center flex-row-reverse">
-      <div class="px-2 text-xs text-font-dark-blue">
+      <div class="px-2 text-sm text-font-dark-blue">
         {{ text }}
       </div>
         <app-icon
@@ -198,6 +198,7 @@ export default Vue.extend({
     handleClickCopy() {
       const btn = this.$refs.btn as HTMLElement;
       new Clipboard(btn);
+      this.$toast('复制成功')
     },
     onCancel() {},
     onSelect(value: any) {

src/components/common/Steps.vue

@@ -3,14 +3,14 @@
       <div class="step-item flex flex-col  content-center relative mr-5 items-center" v-for="(i,index) in data" :key="index"
       :class="currentStep < index+1?'step-item':' step-item-actived'"
       >
-         <div class="cycle relative items-center  rounded-full z-10" :class="currentStep < index+1?'bg-font-gray bg-opacity-20':' bg-green-300 bg-opacity-80'">
+         <div class="cycle relative items-center  rounded-full z-10" :class="currentStep < index+1?'bg-font-gray bg-opacity-20':' bg-font-blue bg-opacity-80'">
             <div class="center-child" v-if="currentStep < index+1">{{index+1}}</div>
             <div class="center-child" v-else-if="currentStep=== index+1">{{index+1}}</div>
             <div class="center-child" v-else>
                  <app-icon name='icon-comfirm'></app-icon>
             </div>
          </div>
-         <div class='text-sm mt-2'>
+         <div class='text-sm mt-2' :class="currentStep < index+1?'text-font-gray bg-opacity-20':' text-font-blue bg-opacity-80'">
           {{i.text}}
          </div>
       </div>
@@ -86,7 +86,7 @@ export default Vue.extend({
       width: 24px;
       height:2px;
       border-radius: 3px;
-      background-color:rgba(110, 231, 183,0.8);
+      background-color:#0078FF;
       position: absolute;
       top: 34%;
       left: 120%;

src/service/Service.ts

@@ -35,7 +35,7 @@ export class Service {
                         router.push('')
                     })
                 }
-                Toast.fail(ret.message)
+                Toast.fail(typeof ret.data === "string" ? ret.data : ret.message)
                 throw new Error(ret.message)
             }
         }

src/style.less

@@ -97,4 +97,20 @@ body{
       font-weight: 500;
       color: #0078FF;
     }
-  }
\ No newline at end of file
+  }
+
+.van-popup{
+  .van-action-sheet__gap{
+    background-color: #131934;
+  }
+  .van-action-sheet__item,.van-action-sheet__cancel{
+    background-color: #1D2649;
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #EEF1F6;
+  }
+  .van-action-sheet__cancel:active, .van-action-sheet__item:active{
+    background-color: #394267;
+  }
+}
\ No newline at end of file

src/view/Auth/Login/components/LoginButton/index.vue

@@ -7,8 +7,8 @@
       @btnClicked="handleCliCkBtn"
       border="border-0"
       :class="[
-        disabled ? 'darkBtn' : 'bg-font-blue',
-        disabled ? 'darkBtn' : ' text-white ',
+        disabled ? 'text-font-white bg-font-blue filter grayscale' : 'bg-font-blue',
+        disabled ? 'text-font-white bg-font-blue filter grayscale' : ' text-white ',
         loading ? 'opacity-75': '',
       ]"
     >

src/view/Auth/Login/index.vue

 <template>
   <div class="px-5">
     <Login
-      title="欢迎来到乐映"
+      title="欢迎来到一幕"
       :accountStatusCheckFunc="accountStatusCheckFunc"
       :sendSmsFunc="sendSmsFunc"
       :registerFunc="registerFunc"

src/view/NFT/Create/form.vue

@@ -14,7 +14,7 @@
           v-model="createNFT.value_name"
           type="input"
           text="剧本名称"
-          :validate='{maxLen:20}'
+          :validate="{ maxLen: 20 }"
           placeholder="请输入剧本名称"
           class="text-font-white my-3"
           @cellOnChange="(v) => setCreateNFT({ value_name: v })"
@@ -22,8 +22,9 @@
         <app-cell
           v-model="createNFT.value_publisher"
           type="input"
-          text="发行人"
-          placeholder="请输入发行人名称"
+          text="剧本作者"
+          :validate="{ maxLen: 20 }"
+          placeholder="请输入剧本作者"
           class="text-font-white my-3"
           @cellOnChange="(v) => setCreateNFT({ value_publisher: v })"
         ></app-cell>
@@ -36,18 +37,21 @@
           @onClick="what"
         ></app-cell>
         <div>
-          <div class="text-font-white my-2">剧本简介</div>
+          <div class="my-4 text-font-gray text-sm ml-4">剧本简介</div>
           <textarea
             v-model="createNFT.value_des"
             name="des"
             id="nft-des"
             cols="30"
+            maxlength="1000"
+            placeholder="请输入剧本简介"
             rows="10"
             class="
               w-full
               bg-font-gray bg-opacity-20
               text-font-white
               p-3
+              rounded-md
               text-sm
             "
           ></textarea>
@@ -89,6 +93,7 @@
           @cellOnChange="(v) => (createNFT.archives = v)"
         ></app-cell>
         <app-cell
+          v-if="createNFT.archives === 1"
           text="授权阅读"
           type="select"
           :selected="createNFT.grant"
@@ -195,8 +200,8 @@ export default Vue.extend({
         count: 1,
       },
       archivesList: [
-        { value: 0, name: "加密存档" },
-        { value: 1, name: "不存档" },
+        { value: 0, name: "不存档" },
+        { value: 1, name: "加密存档" },
       ],
       grantList: [
         { value: 0, name: "不需要授权" },

src/view/NFT/Create/upload.vue

@@ -8,7 +8,7 @@
       class="hidden"
       @change="handleFileChange"
       ref="inputFile"
-      accept=".pdf"
+      accept="application/pdf"
     />
     <label for="upload" class="inline-block">
       <div

src/view/User/index.vue

@@ -28,10 +28,13 @@ export default Vue.extend({
   },
   methods:{
       toggleDialog(){
-          console.log(111);
-          
              this.$dialog.alert({
-                message: 'Content',
+                message: '确定要退出登录吗',
+            }).then(()=>{
+                localStorage.clear();
+                this.$router.push({
+                    name: 'Login'
+                })
             });
       }
   }