Merge branch 'dev' of http://git.izouma.com/yuanyuan/nanjing_nft_front into dev

src/components/CollectionList.vue

@@ -4,7 +4,7 @@
         <van-image width="100%" height="164px" :src="getImg(info.pic[0].url)" fit="cover" />
         <!-- <van-image width="100%" height="calc(50vw - 24px)" :src="getImg(changeImgs(info.pic, 600))" fit="cover" class="current_recommendation_img"/> -->
         <div class="current_recommendation_title">{{ info.name }}</div>
-        <div class="current_recommendation_price" :style="{ 'padding-left': info.salable ? '22px' : '10px' }">
+        <div class="current_recommendation_price" :style="{ 'padding-left': info.salable ? '18px' : '9px' }">
             <div v-if="info.salable">
                 <div class="current_recommendation_price_one">￥</div>
                 <div class="current_recommendation_price_two">{{ info.price }}</div>
@@ -150,7 +150,7 @@ export default {
             color: #28b6ff;
             position: absolute;
             bottom: 1px;
-            left: 12px;
+            left: 8px;
         }
         .current_recommendation_price_two {
             font-size: 16px;
@@ -191,6 +191,7 @@ export default {
             margin-right: 2px;
         }
         .give_number {
+            margin-left: 2px;
             height: 18px;
             line-height: 18px;
             font-size: 12px;

src/plugins/colors.js

@@ -2,8 +2,8 @@ export default {
     install(app, options) {
         if (process.env.VUE_APP_PAGE_TYPE == 'raex') {
             app.config.globalProperties.$colors = {
-                prim: '#3AB200',
-                warn: '#3AB200',
+                prim: '#28B6FF',
+                warn: '#28B6FF',
                 font0: '#000000',
                 bg: '#ffffff',
                 bg3: '#f5f7fa'

src/styles/common/theme.less

@@ -1,9 +1,9 @@
 @divider: #f2f4f5;
-@prim: #3ab200;
+@prim: #28B6FF;
 @success: #67c23a;
 @danger: #f56c6c;
-@warn: #3ab200;
-@textP: #3ab200;
+@warn: #28B6FF;
+@textP: #28B6FF;
 @text0: #000000;
 @text1: #323233;
 @text2: #606266;

src/views/Discover.vue

@@ -386,7 +386,7 @@ export default {
         color: #ffffff;
     }
     /deep/ .van-cell {
-        padding-top: 4px;
+        padding: 4px 0px 8px 2px;
         box-sizing: border-box;
     }
     .search {

src/views/account/Login.vue

@@ -134,6 +134,7 @@
                             v-model="loginForm.phone"
                             type="tel"
                             placeholder="请输入手机号"
+                            
                             :rules="[
                                 { required: true, message: '请输入手机号码' },
                                 {
@@ -158,7 +159,10 @@
                     <van-divider class="login_divider" />
                     <div class="login_verification">
                         <div>忘记密码？</div>
-                        <div class="login_verification_con" @click="(verificationCode = true), (verification = true),(active = 'code')">
+                        <div
+                            class="login_verification_con"
+                            @click="(verificationCode = true), (verification = true), (active = 'code')"
+                        >
                             验证码登录
                         </div>
                     </div>
@@ -261,7 +265,7 @@
                     </div>
                 </div>
                 <div>
-                    <div class="account_password_login" @click="verificationCode = false,active = 'phone'">
+                    <div class="account_password_login" @click="(verificationCode = false), (active = 'phone')">
                         账户密码登录
                     </div>
                 </div>
@@ -333,7 +337,9 @@
                     <!-- <div class="register_now_con" @click="registerNow">立即注册</div> -->
                 </div>
             </van-form>
-            <div class="register_now_login" @click="loginRegistrationSwitch = true,active = 'phone'">账户密码登录</div>
+            <div class="register_now_login" @click="(loginRegistrationSwitch = true), (active = 'phone')">
+                账户密码登录
+            </div>
         </div>
         <div class="login_tip">
             登录则代表同意 <span class="login_tip_con">用户协议</span> 和 <span class="login_tip_con">隐私协议</span>
@@ -378,7 +384,7 @@ export default {
             },
             loginForm: {
                 phone: '',
-                password: ""
+                password: ''
             }
         };
     },
@@ -446,19 +452,19 @@ export default {
         //         console.log("1111111")
         //         setTimeout(() => {
         //             this.$router.push("/home")
-                    // this.$router.replace('/home');
-                    // if (this.$store.state.loginBackUrl) {
-                    //     this.$router.replace(this.$store.state.loginBackUrl);
-                    // } else if (
-                    //     !fromRoute ||
-                    //     !fromRoute.name ||
-                    //     fromRoute.name === 'userRegister' ||
-                    //     fromRoute.name === 'userLogin'
-                    // ) {
-                    //     this.$router.replace('/home');
-                    // } else {
-                    //     this.$router.back();
-                    // }
+        // this.$router.replace('/home');
+        // if (this.$store.state.loginBackUrl) {
+        //     this.$router.replace(this.$store.state.loginBackUrl);
+        // } else if (
+        //     !fromRoute ||
+        //     !fromRoute.name ||
+        //     fromRoute.name === 'userRegister' ||
+        //     fromRoute.name === 'userLogin'
+        // ) {
+        //     this.$router.replace('/home');
+        // } else {
+        //     this.$router.back();
+        // }
         //         }, 1500);
         //     });
         // },
@@ -494,7 +500,7 @@ export default {
         submitLoginCodeOne() {
             this.sendMsg(this.loginForm.phone);
         },
-        submitLogin(){
+        submitLogin() {
             this.check().then(() => {
                 this.$toast.success('登录成功');
                 setTimeout(() => {
@@ -511,13 +517,13 @@ export default {
                         this.$router.back();
                     }
                 }, 1500);
-            })
+            });
         },
         check() {
             if (this.active === 'phone') {
                 return this.loginByPhone(this.loginForm.phone, this.loginForm.password);
             } else {
-                console.log("123312221",this.loginForm.phone,this.value)
+                // console.log("123312221",this.loginForm.phone,this.value)
                 return this.$http
                     .post('/auth/phoneLogin', {
                         phone: this.loginForm.phone,
@@ -534,7 +540,7 @@ export default {
                         return this.$store.dispatch('getUserInfo');
                     });
             }
-        },
+        }
         // checkTwo() {
         //     return this.$http
         //         .post('/auth/phoneLogin', {
@@ -686,6 +692,7 @@ export default {
         .login_information_con {
             width: 250px;
             // height: 24px;
+            background: #0f0f27;
         }
         .send_verification {
             background-color: #0f0f27;

src/views/asset/Detail.vue

@@ -60,6 +60,13 @@
             <div class="item_number_number">编号&nbsp;{{info.number}}</div>
         </div>
         <div class="self_information">
+            <div class="display_price">
+                <div class="display_price_left">售价</div>
+                <div class="display_price_right">
+                    <div class="display_price_right_symbol">¥</div>
+                    <div class="display_price_right_number">{{ info.price }}</div>
+                </div>
+            </div>
             <!-- <div class="display_price">
                 <div class="display_price_left">售价</div>
                 <div class="display_price_right">

src/views/order/Detail.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="confirm_order">
         <div class="confirm_order_top">
-            <img :src="require('@assets/icon_jiaoyizhong .png')" alt="" class="confirm_order_top_img">
+            <img :src="info.status == 'FINISH'?'require(`@/assets/icon_jiaoyizhong.png`)':require(`@/assets/icon_yiwancheng@3x.png`)" alt="" class="confirm_order_top_img">
             <div>{{ getLabelName(info.status, statusOptions) }}</div>
         </div>
         <div class="order_information">

src/views/product/Detail.vue

@@ -326,13 +326,6 @@
             <div class="item_number_number">编号&nbsp;47475</div>
         </div> -->
         <div class="self_information">
-            <div class="display_price" v-if="info.price != ''">
-                <div class="display_price_left">售价</div>
-                <div class="display_price_right">
-                    <div class="display_price_right_symbol">¥</div>
-                    <div class="display_price_right_number">{{ info.price }}</div>
-                </div>
-            </div>
             <div class="self_information_one">
                 <van-image width="32px" height="32px" radius="23" :src="info.minterAvatar || require('@assets/svgs/img_default_photo.svg')" fit="cover"/>
                 <div class="self_information_one_text">
@@ -1238,8 +1231,8 @@ export default {
         justify-content: space-between;
         position: fixed;
         bottom: 0;
-        padding-bottom: calc(@bottom+ constant(safe-area-inset-bottom));
-        padding-bottom: calc(@bottom + env(safe-area-inset-bottom));
+        // padding-bottom: calc(@bottom+ constant(safe-area-inset-bottom));
+        // padding-bottom: calc(@bottom + env(safe-area-inset-bottom));
         .transaction_button_left {
             display: flex;
             .transaction_price {
@@ -1259,7 +1252,7 @@ export default {
                 }
             }
             .transaction_tax {
-                padding: 28px 0 12px 0;
+                padding: 31px 0 12px 0;
                 box-sizing: border-box;
                 font-size: 12px;
                 font-family: PingFangSC-Regular, PingFang SC;
@@ -1271,18 +1264,18 @@ export default {
             }
         }
         .transaction_button_right {
-            padding: 8px 0;
+            padding-top: 10px;
             box-sizing: border-box;
             .sold_out {
                 width: 160px;
-                height: 40px;
+                height: 46px;
                 background: #29293f;
                 border-radius: 8px;
                 font-size: 16px;
                 font-family: PingFangSC-Medium, PingFang SC;
                 font-weight: 500;
                 color: #939599;
-                line-height: 40px;
+                line-height: 46px;
                 text-align: center;
             }
             .coming_on_sale {
@@ -1335,7 +1328,7 @@ export default {
             }
         }
     }
-    @bottom: 6px;
+    // @bottom: 6px;
     .purchase_transaction_button {
         width: 100%;
         height: 56px;
@@ -1390,8 +1383,8 @@ export default {
         box-sizing: border-box;
         position: fixed;
         bottom: 0;
-        padding-bottom: calc(@bottom+ constant(safe-area-inset-bottom));
-        padding-bottom: calc(@bottom + env(safe-area-inset-bottom));
+        // padding-bottom: calc(@bottom+ constant(safe-area-inset-bottom));
+        // padding-bottom: calc(@bottom + env(safe-area-inset-bottom));
         .show_only_con {
             width: 100%;
             height: 40px;

src/views/product/List.vue

@@ -237,13 +237,13 @@ export default {
         actions() {
             let list = [{ name: '综合排序' }, { name: '在售中' }, { name: '仅展示' }];
             if (this.salable === '') {
-                list[0].color = this.$colors.prim;
+                list[0].color = "#28B6FF"
             }
             if (this.salable === true) {
-                list[1].color = this.$colors.prim;
+                list[1].color = "#28B6FF"
             }
             if (this.salable === false) {
-                list[2].color = this.$colors.prim;
+                list[2].color = "#28B6FF"
             }
             return list;
         }
@@ -577,10 +577,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-/deep/ .van-tab--active {
-    font-weight: 500;
-    color: #28b6ff;
-}
 /deep/ .van-tabs__nav--complete {
     padding: 0;
     border: none;
@@ -812,4 +808,8 @@ export default {
         }
     }
 }
+.van-tab.van-tab--active{
+    color: #28b6ff;
+    font-weight: 500;
+}
 </style>

src/views/product/orderDetails.vue

@@ -2,7 +2,7 @@
     <!-- 交易状态 -->
     <div class="confirm_order">
         <div class="confirm_order_top">
-            <img :src="require('@assets/icon_jiaoyizhong .png')" alt="" class="confirm_order_top_img">
+            <img :src="require('@assets/icon_jiaoyizhong.png')" alt="" class="confirm_order_top_img">
             <div>{{transactionStatus}}</div>
         </div>
         <div class="order_information">

src/views/user/BanksAdd.vue

@@ -38,7 +38,7 @@
                 <div class="cancel" @click="show = false">取消</div>
                 <div class="title">输入验证码</div>
                 <div class="phone">已发送到您{{ phoneText }}手机</div>
-                <van-password-input :value="form.code" :length="6" />
+                <van-password-input :value="form.code" :length="4" />
                 <!-- 数字键盘 -->
                 <van-number-keyboard
                     maxlength="4"