Merge branch 'master' of git.huaml.com:zhh/front-end

ghsApp/src/admin/home/me.vue

@@ -85,7 +85,7 @@
               <view class="renew-promo-copy">
                 <view class="renew-promo-line1">
                   <text class="renew-promo-line1-em">限时抢购</text>
-                  <text class="renew-promo-line1-rest">终身买断版</text>
+                  <text class="renew-promo-line1-rest">终身买断</text>
                 </view>
                 <text class="renew-promo-line2">单店多店 · 多档可选 · 尊享福利</text>
               </view>

ghsApp/src/admin/shop/renew.vue

@@ -28,7 +28,7 @@
                     </view>
                     <view class="benefit-title-row benefit-title-row--banner">
                         <text class="benefit-title-flank benefit-title-flank--banner">✦</text>
-                        <text class="benefit-title-text benefit-title-text--banner">终身买断版福利</text>
+                        <text class="benefit-title-text benefit-title-text--banner">终身买断福利</text>
                         <text class="benefit-title-flank benefit-title-flank--banner">✦</text>
                     </view>
                 </view>

hdPad/src/pages/home/components/customList.vue

@@ -3,7 +3,7 @@
         <view class="title">列表</view>
         <view class="order-status">
             <view @tap="changeType(0)" :class="[{'checked':type===0}]">全部</view>
-            <view v-if="haveVip" @tap="changeType(5)" :class="[{'checked':type===5}]">会员</view>
+            <view @tap="changeType(5)" :class="[{'checked':type===5}]">会员</view>
             <view @tap="changeType(2)" :class="[{'checked':type===2}]">余额</view>
             <view @tap="changeType(1)" :class="[{'checked':type===1}]">消费</view>
             <view @tap="changeType(3)" :class="[{'checked':type===3}]">生日</view>
@@ -63,8 +63,7 @@
                             <block v-else>
                                 <text class="balance">待审核</text>
                             </block>
-                            <text v-if="useVip" v-show="Number(item.vip) == 1" class="level">{{ item.memberName }}</text>
-                            <text v-else class="level">{{ item.memberName }}</text>
+                            <text v-if="Number(item.vip) == 1" class="level">{{ item.memberName }}</text>
                         </view>
                         <view class="customer-details">
                             <text class="mobile">{{ item.mobile }}</text>
@@ -93,16 +92,11 @@ export default {
             sn:'',
             searchText: '',
             searchTimer: null,
-            searchStyle:0,
-            haveVip:false,
-            useVip:0 // 是否启用VIP
+            searchStyle:0
         }
     },
     created(){
         this.getCustomData()
-
-        const shopInfo = this.$store.getters.getMyShopInfo.shop
-        this.useVip = shopInfo.reachVip != "0.00"
     },
     methods:{
         changeSearchStyle(){
@@ -119,6 +113,7 @@ export default {
             console.log('onRestore')
         },
         changeType(type){
+            this.$util.hitVoice()
             this.type = type
             this.resetList()
             this.getCustomData()
@@ -167,7 +162,6 @@ export default {
             let params = {page:this.list.page,pageSize:20,type:this.type,searchStyle:this.searchStyle,searchText:this.searchText}
             return getCustomList(params).then(res=>{
                 if(res.code == 1){
-                    this.haveVip = res.data.vip > 0
                     this.completes(res)
                     if(this.list.data && this.list.data[0]){
                         this.getCustomInfo(this.list.data[0])