From 7948826a2ab8132c96e28515ea45df44aa1961c3 Mon Sep 17 00:00:00 2001
From: tangyi <275503107@qq.com>
Date: Thu, 10 Mar 2022 14:19:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E5=85=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 component/pageHead.vue                     | 20 +++++++++---
 pages/aboutUs/aboutUs.vue                  |  2 ++
 pages/classify/classify.vue                |  3 +-
 pages/commodity/commodity.vue              | 20 ++++++++----
 pages/index/login.vue                      |  4 +--
 pages/personalCenter/changeInformation.vue | 38 +++++++++++++---------
 pages/personalCenter/personalCenter.vue    |  6 ++--
 pages/search/search.vue                    |  9 +++--
 8 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/component/pageHead.vue b/component/pageHead.vue
index b26cd7b..86771ef 100644
--- a/component/pageHead.vue
+++ b/component/pageHead.vue
@@ -1,7 +1,10 @@
 <template>
-    <view  :style="{'height':customBar}" class="head" :class="brF?'br':''">
+    <view  :style="{'height':customBar}" class="head" >
         <view :style="{'height':customBar}" class="headCom" :class="brF?'br':''">
-          <image @click="navigateBackFun()" class="imh" v-if="navState" src="../static/fh.png" mode=""></image> 
+            <view class="imh" @click="navigateBackFun()"  v-if="navState">
+                   <image class="imng"  src="../static/fh.png" mode=""></image> 
+            </view>
+       
           <view class="textInt">
               {{text}}
           </view>
@@ -67,7 +70,9 @@
            
           
                this.customBar=customBar+100+"rpx"
+               
                console.log(  this.customBar)
+                   uni.setStorageSync('customBar',customBar+100);
               
                }
            }) 
@@ -86,7 +91,6 @@
     
 .head{
     width: 100%;
-    background-color: #F5F5F5
     
 }
 .headCom{
@@ -105,9 +109,15 @@
 .imh{
      width: 30rpx;
      height: 30rpx;
-     position: absolute;
-     left: 40rpx;
      
+     position: absolute;
+     left: 10rpx;
+     padding:  30rpx;
+     padding-bottom: 0rpx;
+}
+.imng{
+    width: 30rpx;
+    height: 30rpx;
 }
 .br{
     background-color: #FFFFFF;
diff --git a/pages/aboutUs/aboutUs.vue b/pages/aboutUs/aboutUs.vue
index 24387cd..1035574 100644
--- a/pages/aboutUs/aboutUs.vue
+++ b/pages/aboutUs/aboutUs.vue
@@ -88,7 +88,9 @@
         height: 390rpx;
         border-radius: 25rpx;
         margin-top: 40rpx;
+        -webkit-backface-visibility: hidden;-webkit-transform: translate3d(0, 0, 0);
         overflow: hidden;
+        border: 2rpx solid #DDDDDD; 
 
     }
 
diff --git a/pages/classify/classify.vue b/pages/classify/classify.vue
index 1a40845..bf71b85 100644
--- a/pages/classify/classify.vue
+++ b/pages/classify/classify.vue
@@ -245,7 +245,7 @@
     }
 
     .classifyCon {
-        width: 623rpx;
+        flex: 1;
         padding: 0 20rpx;
         box-sizing: border-box;
         position: relative;
@@ -255,7 +255,6 @@
         margin: auto;
         overflow-x: auto;
         padding-top: 30rpx;
-        width: 100%;
         z-index: 3;
         padding-bottom: 30rpx;
         position: absolute;
diff --git a/pages/commodity/commodity.vue b/pages/commodity/commodity.vue
index 9934312..7f59121 100644
--- a/pages/commodity/commodity.vue
+++ b/pages/commodity/commodity.vue
@@ -15,7 +15,7 @@
                {{ commodityData.detail.name}}
             </view> 
             
-            <view class="dz">
+            <view class="dz" v-if="item.customized==1">
                 可定制
             </view>
             <view class="money">
@@ -80,7 +80,7 @@
         </view>
     
         <view class="subscriptionButton" @click="makePhoneCallFun()">
-            立即订阅
+        立即订购
         </view>
          <view class="make" :class="popupState?'makedis':''">
              
@@ -90,11 +90,12 @@
             <view class="popupTitle">
                   <image class="img" @click="previewImg(commodityData.detail.cover)" :src="commodityData.detail.cover" mode="aspectFill"></image>
                   <view class="money" v-if="money">
-                      {{money}}
+                       <text >￥</text> {{money}}
                   </view>
-                  <view  class="money" v-else>
-                      
+                  <view class="money textmoney" v-else>
+                      暂无报价
                   </view>
+                 
                   <view class="text">
                       （点击上方封面可查看大图）
                   </view>
@@ -166,7 +167,7 @@
                    this.commodityData.sku[i].state=false
                 } 
                   this.commodityData.sku[index].state =true
-             this.money=this.commodityData.sku[index].price
+             this.money=this.commodityData.sku[index].price_text
                  
                    this.commodityData.sku=[...this.commodityData.sku]
              },
@@ -353,6 +354,7 @@
         font-size: 48rpx;
         text-align: center;
         font-weight: bold;
+            line-height: 58rpx;
         color: #D33333;
     }
     .popupTitle .text{
@@ -464,4 +466,10 @@
         line-height: 28rpx;
         background-color: #D33333;
     }
+    .popupTitle .textmoney{
+        font-size: 40rpx;
+        line-height: 48rpx;
+            line-height: 58rpx;
+        
+    }
 </style>
diff --git a/pages/index/login.vue b/pages/index/login.vue
index d8e1ac1..237f179 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -67,7 +67,7 @@
         width: 200rpx;
         margin: auto;
         height: 200rpx;
-        margin-top: 150rpx;
+        margin-top: 350rpx;
         border-radius: 50rpx;
         box-shadow: 2rpx 2rpx 10rpx rgba(0, 0, 0, 0.5);
 
@@ -91,7 +91,7 @@
         width: 630rpx;
         background-color: #1aad19 !important;
         margin: auto;
-        margin-top: 30vh;
+        margin-top: 10vh;
     }
 
     .text {
diff --git a/pages/personalCenter/changeInformation.vue b/pages/personalCenter/changeInformation.vue
index 8fadcd0..f0ff682 100644
--- a/pages/personalCenter/changeInformation.vue
+++ b/pages/personalCenter/changeInformation.vue
@@ -21,68 +21,68 @@
                 </view>
                 <view class="hint">
                     <view class="text">
-                        Anita Rose
+                       {{userData.nickname}}
                     </view>
                     <view class="arrows">
 
                     </view>
                 </view>
             </view>
-            <view class="con">
+            <view class="con" @click="modification()">
                 <view class="listName">
                     <view class="text">
                         真实姓名
                     </view>
                 </view>
-                <view class="hint" @click="modification()">
+                <view class="hint">
                     <view class="text">
                         {{userData.real_name}}
                     </view>
                     <image class="arrows" src="../../static/jt.png" mode=""></image>
                 </view>
             </view>
-            <view class="con">
+            <button class="con hintBUTTON" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
                 <view class="listName">
                     <view class="text">
                         联系电话
                     </view>
                 </view>
-                <button  class="hint hintBUTTON"  open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+                <view  class="hint"  >
                     <view class="text">
                         {{userData.mobile}}
                         
                     </view>
                        <image class="arrows" src="../../static/jt.png" mode=""></image>
-                </button>
+                </view>
                 
-            </view>
-            <view class="con">
+            </button>
+            <view class="con" @tap="popup_bottom()">
                 <view class="listName">
                     <view class="text">
                         联系地址
                     </view>
                 </view>
-                <view class="hint" @tap="popup_bottom()">
+                <view class="hint" >
                     <view class="text">
                         {{userData.address}}
                     </view>
                     <image class="arrows" src="../../static/jt.png" mode=""></image>
                 </view>
             </view>
-            <view class="con">
+            <view class="con" @click="modificationA()">
                 <view class="listName">
                     <view class="text">
                         详细地址
                     </view>
                 </view>
-                <view class="hint" @click="modificationA()">
+                <view class="hint" >
                     <view class="text">
                         {{userData.address_detail}}
                     </view>
                     <image class="arrows" src="../../static/jt.png" mode=""></image>
                 </view>
             </view>
-            <view class="con">
+            <view class="con" @click="vipAooly()">
                 <view class="listName">
                     <view class="text" v-if="!userData.vip_code" >
                         会员码输入
@@ -91,7 +91,7 @@
                         会员码
                     </view>
                 </view>
-                <view class="hint"  v-if="!userData.vip_code"  @click="vipAoolyState()"> 
+                <view class="hint"  v-if="!userData.vip_code"  > 
                     <view class="text">
                         输入会员码成为会员
                     </view>
@@ -190,10 +190,15 @@
             this.getUserData()
         },
         methods: {
+            vipAoolyState() {
+                this.memberState = true
+            },
             canceVipState() {
                 this.memberStateApply = false
             },
             SubmitValidation(){
+           
+            
                 if(this.invitee_vip_code){
                        this.memberStateApply = false
                          this.changeInformation("vip_code",this.invitee_vip_code)
@@ -208,7 +213,7 @@
                
             },
             getPhoneNumber(e) {
-                console.log()
+         
               
                 this.requestToken({
                     url: this.host + "/api/user/bind-phone",
@@ -225,6 +230,9 @@
                 })
             },
             vipAooly() {
+                if(this.userData.vip_code){
+                    return
+                }
                 this.memberStateApply = true
             },
             changeInformationAddress_detail(){
@@ -253,7 +261,7 @@
             },
             changeInformation(key, value) {
                 this.makeState = false
-                console.log(key, value)
+               
                 this.requestToken({
                     url: this.host + "/api/user/editInfo",
                     type: "post",
diff --git a/pages/personalCenter/personalCenter.vue b/pages/personalCenter/personalCenter.vue
index 9485fc5..df0305a 100644
--- a/pages/personalCenter/personalCenter.vue
+++ b/pages/personalCenter/personalCenter.vue
@@ -8,8 +8,8 @@
             <view class="name">
                 {{userInfo.nickname}}
             </view>
-            <view class="Id" v-if="userInfo.is_active==1">
-                （尊贵会员：{{userInfo}}）
+            <view class="Id" v-if="userInfo.vip_code">
+                （尊贵会员：{{userInfo.vip_code}}）
             </view>
         </view>
 
@@ -189,7 +189,7 @@
                     success: (res) => {
                         
                  this.userInfo = res.data.data
-                 console.log(this.userInfo)
+                 
                     }
                 
                 })
diff --git a/pages/search/search.vue b/pages/search/search.vue
index b4c0dc5..d26868d 100644
--- a/pages/search/search.vue
+++ b/pages/search/search.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="content pt">
           <page-head text="搜索" navState="true" ></page-head>
-        <view class="top">
+        <view class="top"  :style="{'top':customBar}">
             <view class="int">
                 <image class="intImg" src="../../static/ss.png" mode=""></image>
                 <input  placeholder="搜索"   v-model="inputVal"  @input="inputFun()" placeholder-class="InputC" class="input" type="text" value="" />
@@ -45,6 +45,7 @@
                 loadStateIf:false,
                 num:10,
                record:"",
+               customBar:"190rpx",
                 loadState:"more",
                 arr: {
                     page: 1,
@@ -52,6 +53,9 @@
                 }
             }
         },
+    created() {
+             this.customBar=uni.getStorageSync('customBar')+20+"rpx"
+    },
         onReachBottom() {
           this.arr.size= this.arr.size+this.num
         
@@ -116,8 +120,7 @@
         position: fixed;
         width: 100%;
         left: 0rpx;
-           padding-top: 170rpx;
-           top: 0rpx;
+           top: 170rpx;
            background-color: #f6f6f6;
            padding-right: 40rpx;
            padding-left: 40rpx;