修改

components/twocoluList.vue

@@ -33,6 +33,8 @@
 				user_type:uni.getStorageSync('user_type')//权限
 			};
 		},
+		mounted() {
+		},
 		methods:{
 			addChe(id){//加入购物车事件
 				// console.log(this.dataList);

pages/tabbar/homePage/homePage.vue

@@ -88,7 +88,7 @@
                 </scroll-view>
                 <!-- 列表 -->
 				 <!-- @addChe="addChe" -->
-				<twocoluList :dataList="dataList"></twocoluList>
+				<twocoluList v-if="dataList.length!=0" :dataList="dataList"></twocoluList>
                 <!-- 更多 -->
                 <view v-if="gisok" class="margin-sx26 textc color9 fon26">{{gcontent}}</view>
             </view>
@@ -139,10 +139,11 @@
 				total:'',
 				isZanw:true,
 				statusHNH:uni.getStorageSync('statusHNH'),
-				pageShow:false
+				pageShow:false,
             };
         },
 		onReachBottom() {
+			if(this.dataList.length!=0){
 				if(this.total!=this.dataList.length){
 					this.page++
 					this.checkList()//调用自主预约列表事件
@@ -150,12 +151,13 @@
 					if(this.isZanw) this.$toolAll.tools.showToast('暂无更多商品列表','none',1000)
 					this.isZanw = false
 				}
+			}
 		},
         onPageScroll(e) {
             e.scrollTop > 360 ? this.showTop = true : this.showTop = false
         },
         onShow() {
-			if(uni.getStorageSync('is_active')!='' && uni.getStorageSync('is_active')!=0) this.$toolAll.tools.guoq()
+			this.$toolAll.tools.guoq()
             uni.showTabBar()
         },
         onLoad(options) {
@@ -182,7 +184,14 @@
 			this.requestGao()//查询公告
 			this.reMen()//查询热门产品
 			this.shaiEv()//查询商品分类
+			let timer = setInterval(()=>{
+				console.log(uni.getStorageSync('user_type'));
+				if(uni.getStorageSync('user_type')!=''){
 					this.checkList()//商品列表查询事件
+					clearInterval(timer)
+				}
+			},1000)
+			
         },
         methods: {
 			shaiEv(){//商品分类查询事件

pagesA/productDetail/productDetail.vue

@@ -9,10 +9,11 @@
 				<view class="margin20">
 					<view class="disba">
 						<!-- 现价、原价 -->
-						<view>
+						<view v-if="user_type!='personal'">
 							<view class="colorf78 fon24 bold">￥<text class="fon36">{{proDetailTwo.cur_price/100}}</text>.00</view>
 							<view class="color9 fon24 dis">原价<text style="text-decoration: line-through;">￥{{proDetailTwo.price/100}}.00</text></view>
 						</view>
+						<view v-if="user_type=='personal'" class="colorf78 fon24 bold">￥<text class="fon36">{{proDetailTwo.price/100}}</text>.00</view>
 						<!-- 收藏 -->
 						<view class="discc" @tap="collection(proDetail.id)">
 							<image v-if="isCollection" style="width: 40rpx; height: 38rpx;" src="/static/img/public/shouc.png" mode=""></image>

unpackage/dist/dev/mp-weixin/components/twocoluList.js

@@ -147,6 +147,8 @@ var _default2 =
       user_type: uni.getStorageSync('user_type') //权限
     };
   },
+  mounted: function mounted() {
+  },
   methods: {
     addChe: function addChe(id) {var _this = this; //加入购物车事件
       // console.log(this.dataList);

unpackage/dist/dev/mp-weixin/pages/tabbar/homePage/homePage.js

@@ -281,6 +281,7 @@ __webpack_require__.r(__webpack_exports__);
 
   },
   onReachBottom: function onReachBottom() {
+    if (this.dataList.length != 0) {
       if (this.total != this.dataList.length) {
         this.page++;
         this.checkList(); //调用自主预约列表事件
@@ -288,12 +289,13 @@ __webpack_require__.r(__webpack_exports__);
         if (this.isZanw) this.$toolAll.tools.showToast('暂无更多商品列表', 'none', 1000);
         this.isZanw = false;
       }
+    }
   },
   onPageScroll: function onPageScroll(e) {
     e.scrollTop > 360 ? this.showTop = true : this.showTop = false;
   },
   onShow: function onShow() {
-    if (uni.getStorageSync('is_active') != '' && uni.getStorageSync('is_active') != 0) this.$toolAll.tools.guoq();
+    this.$toolAll.tools.guoq();
     uni.showTabBar();
   },
   onLoad: function onLoad(options) {var _this2 = this;
@@ -320,7 +322,14 @@ __webpack_require__.r(__webpack_exports__);
     this.requestGao(); //查询公告
     this.reMen(); //查询热门产品
     this.shaiEv(); //查询商品分类
-    this.checkList(); //商品列表查询事件
+    var timer = setInterval(function () {
+      console.log(uni.getStorageSync('user_type'));
+      if (uni.getStorageSync('user_type') != '') {
+        _this2.checkList(); //商品列表查询事件
+        clearInterval(timer);
+      }
+    }, 1000);
+
   },
   methods: {
     shaiEv: function shaiEv() {var _this3 = this; //商品分类查询事件

unpackage/dist/dev/mp-weixin/pages/tabbar/homePage/homePage.wxml

@@ -1 +1 @@
-<view><view class="posir"><image class="posia" style="width:100%;" src="/static/img/pageh/headb.png"></image><view class="posi-tzy zIn5 statusHNH" style="background:url(https://s3.jpg.cm/2021/07/22/I6PtxL.png) fixed top;background-size:100%;"><view style="{{'height:'+(statusBarHeight+'px')+';'}}"></view><view class="padding-z20 disac width100 navBarH" style="{{'background:'+(backgroudColor)+';'}}"><view class="tab-title titlec" style="color:#ffffff;">登锐商城</view></view></view><view class="margin-zy20 disba" style="{{'padding-top:'+(statusHNH+'px')+';'}}"><view class="searchRadius disac ptwo-input-box"><image class="searcht margin-z20" src="/static/img/pageh/sousuo.png"></image><input class="margin-z10 fon26 colorh width100" disabled="{{true}}" placeholder="搜索的内容" placeholder-class="searchpla" type="text" data-event-opts="{{[['tap',[['inputFocus',['$event']]]]]}}" bindtap="__e"/></view></view><view class="margin20"><view class="radius10"><swiper class="banner-box" indicator-color="#f9f9f9" indicator-active-color="#1c4593" indicator-dots="{{true}}" easing-function="easeOutCubic" autoplay="{{true}}" interval="{{3000}}" circular="{{true}}" duration="{{1000}}"><block wx:for="{{bannerList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block wx:if="{{bannerList.length!=0}}"><swiper-item><view class="swiper-item"><image class="width100 banner-box radius10" src="{{item.src}}" mode="aspectFill"></image></view></swiper-item></block></block></swiper></view><view class="margin-sx20 disac zIn4" style="position:relative;"><view class="disac flexs"><image class="gimg" src="/static/img/pageh/gonggao.png" mode></image><view class="fon26 gtitle margin-z10"><view class="_i">小程序公告:</view></view></view><view class="disba width100"><view class="fon24 color6 margin-zy20 width100"><lw-notice vue-id="732ddc22-1" list="{{advanceListTwo}}" data-event-opts="{{[['^dangGao',[['dangGao']]]]}}" bind:dangGao="__e" bind:__l="__l"></lw-notice></view><view data-event-opts="{{[['tap',[['goNotices',['$event']]]]]}}" class="fon24 color9 margin-y20 flexs" bindtap="__e">更多</view></view></view></view><view class="discc width100 textc" style="background:url(https://s3.jpg.cm/2021/07/22/I6P1IW.png) no-repeat;background-size:100% 100%;"><view class="fon36 colorb bold margin-s40 disbcac"><image class="reba" src="/static/img/pageh/rebefore.png"></image><view class="margin-zy20">厂家送红包 购100送70</view><image class="reba" src="/static/img/pageh/reaffter.png"></image></view><view class="fon24 colorb margin-sx20 discc"><view class="zIn1">红包可提现，也可分次购货</view><view class="tiao"></view></view><view class="fon24 margin-x20" style="color:rgba(255,255,255,.7);">商城产品低于市场价70%，红包可选择长期分红更划算</view><block wx:for="{{zanReArrImg}}" wx:for-item="itemre" wx:for-index="indexre" wx:key="indexre"><view class="reboxre margin-zy20 margin-x20" style="width:94%;"><image class="radius10" style="width:100%;height:342rpx;" mode="aspectFill" src="{{itemre.src}}" data-event-opts="{{[['tap',[['goReDetail',['$0'],[[['zanReArrImg','',indexre,'link']]]]]]]}}" bindtap="__e"></image></view></block></view><view class="width100"><scroll-view style="height:80rpx;" scroll-x="true"><view class="disba margin20 catebox"><block wx:for="{{cateList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['chooseCate',['$0',index],[[['cateList','',index,'id']]]]]]]}}" class="{{['disac','flexs',current==index?'pactive':'pmo']}}" bindtap="__e">{{item.name}}<view class="pxian"></view></view></block></view></scroll-view><twocolu-list vue-id="732ddc22-2" dataList="{{dataList}}" bind:__l="__l"></twocolu-list><block wx:if="{{gisok}}"><view class="margin-sx26 textc color9 fon26">{{gcontent}}</view></block></view><back-top vue-id="732ddc22-3" showTop="{{showTop}}" data-event-opts="{{[['^backTop',[['backTop']]]]}}" bind:backTop="__e" bind:__l="__l"></back-top></view></view>
+<view><view class="posir"><image class="posia" style="width:100%;" src="/static/img/pageh/headb.png"></image><view class="posi-tzy zIn5 statusHNH" style="background:url(https://s3.jpg.cm/2021/07/22/I6PtxL.png) fixed top;background-size:100%;"><view style="{{'height:'+(statusBarHeight+'px')+';'}}"></view><view class="padding-z20 disac width100 navBarH" style="{{'background:'+(backgroudColor)+';'}}"><view class="tab-title titlec" style="color:#ffffff;">登锐商城</view></view></view><view class="margin-zy20 disba" style="{{'padding-top:'+(statusHNH+'px')+';'}}"><view class="searchRadius disac ptwo-input-box"><image class="searcht margin-z20" src="/static/img/pageh/sousuo.png"></image><input class="margin-z10 fon26 colorh width100" disabled="{{true}}" placeholder="搜索的内容" placeholder-class="searchpla" type="text" data-event-opts="{{[['tap',[['inputFocus',['$event']]]]]}}" bindtap="__e"/></view></view><view class="margin20"><view class="radius10"><swiper class="banner-box" indicator-color="#f9f9f9" indicator-active-color="#1c4593" indicator-dots="{{true}}" easing-function="easeOutCubic" autoplay="{{true}}" interval="{{3000}}" circular="{{true}}" duration="{{1000}}"><block wx:for="{{bannerList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block wx:if="{{bannerList.length!=0}}"><swiper-item><view class="swiper-item"><image class="width100 banner-box radius10" src="{{item.src}}" mode="aspectFill"></image></view></swiper-item></block></block></swiper></view><view class="margin-sx20 disac zIn4" style="position:relative;"><view class="disac flexs"><image class="gimg" src="/static/img/pageh/gonggao.png" mode></image><view class="fon26 gtitle margin-z10"><view class="_i">小程序公告:</view></view></view><view class="disba width100"><view class="fon24 color6 margin-zy20 width100"><lw-notice vue-id="732ddc22-1" list="{{advanceListTwo}}" data-event-opts="{{[['^dangGao',[['dangGao']]]]}}" bind:dangGao="__e" bind:__l="__l"></lw-notice></view><view data-event-opts="{{[['tap',[['goNotices',['$event']]]]]}}" class="fon24 color9 margin-y20 flexs" bindtap="__e">更多</view></view></view></view><view class="discc width100 textc" style="background:url(https://s3.jpg.cm/2021/07/22/I6P1IW.png) no-repeat;background-size:100% 100%;"><view class="fon36 colorb bold margin-s40 disbcac"><image class="reba" src="/static/img/pageh/rebefore.png"></image><view class="margin-zy20">厂家送红包 购100送70</view><image class="reba" src="/static/img/pageh/reaffter.png"></image></view><view class="fon24 colorb margin-sx20 discc"><view class="zIn1">红包可提现，也可分次购货</view><view class="tiao"></view></view><view class="fon24 margin-x20" style="color:rgba(255,255,255,.7);">商城产品低于市场价70%，红包可选择长期分红更划算</view><block wx:for="{{zanReArrImg}}" wx:for-item="itemre" wx:for-index="indexre" wx:key="indexre"><view class="reboxre margin-zy20 margin-x20" style="width:94%;"><image class="radius10" style="width:100%;height:342rpx;" mode="aspectFill" src="{{itemre.src}}" data-event-opts="{{[['tap',[['goReDetail',['$0'],[[['zanReArrImg','',indexre,'link']]]]]]]}}" bindtap="__e"></image></view></block></view><view class="width100"><scroll-view style="height:80rpx;" scroll-x="true"><view class="disba margin20 catebox"><block wx:for="{{cateList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['chooseCate',['$0',index],[[['cateList','',index,'id']]]]]]]}}" class="{{['disac','flexs',current==index?'pactive':'pmo']}}" bindtap="__e">{{item.name}}<view class="pxian"></view></view></block></view></scroll-view><block wx:if="{{dataList.length!=0}}"><twocolu-list vue-id="732ddc22-2" dataList="{{dataList}}" bind:__l="__l"></twocolu-list></block><block wx:if="{{gisok}}"><view class="margin-sx26 textc color9 fon26">{{gcontent}}</view></block></view><back-top vue-id="732ddc22-3" showTop="{{showTop}}" data-event-opts="{{[['^backTop',[['backTop']]]]}}" bind:backTop="__e" bind:__l="__l"></back-top></view></view>

unpackage/dist/dev/mp-weixin/pagesA/productDetail/productDetail.js

@@ -217,6 +217,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 
 
 {

unpackage/dist/dev/mp-weixin/pagesA/productDetail/productDetail.wxml

@@ -1 +1 @@
-<view class="padding-x120"><status-nav vue-id="4df589b9-1" statusBackw="{{true}}" whereCome="{{whereCome*1}}" statusTitle="{{true}}" title-val="{{titleVal}}" tabcolor="#ffffff" bind:__l="__l"></status-nav><block wx:if="{{pageShow}}"><view><view class="bacb padding-x20" style="{{'padding-top:'+(statusHNH+10+'px')+';'}}"><image style="height:682rpx;width:100%;margin-top:20rpx;" src="{{zhuImg}}" mode="aspectFit"></image><view class="margin20"><view class="disba"><view><view class="colorf78 fon24 bold">￥<text class="fon36">{{proDetailTwo.cur_price/100}}</text>.00</view><view class="color9 fon24 dis">原价<text style="text-decoration:line-through;">{{"￥"+proDetailTwo.price/100+".00"}}</text></view></view><view data-event-opts="{{[['tap',[['collection',['$0'],['proDetail.id']]]]]}}" class="discc" bindtap="__e"><block wx:if="{{isCollection}}"><image style="width:40rpx;height:38rpx;" src="/static/img/public/shouc.png" mode></image></block><block wx:else><image class="animated bounceIn" style="width:40rpx;height:38rpx;" src="/static/img/public/shoucactive.png" mode></image></block><view class="fon24 color9 margin-s10">收藏</view></view></view><view class="color33 fon32 margin-sx16 clips2">{{proDetail.name}}</view><view class="fon24 color9">{{proDetail.sub_title}}</view></view></view><block wx:if="{{user_type!='personal'}}"><view class="margin-s20 bacb"><view class="disba padding-sx20 padding-zy20"><view class="fon32 bold">{{"商品评价("+evalTotal+")"}}</view><view class="disac"><view data-event-opts="{{[['tap',[['checkAllp',['$0'],['proDetail.id']]]]]}}" class="fon26 color9 margin-y10" bindtap="__e">查看全部</view><image style="width:12rpx;height:22rpx;" src="/static/img/my/youj.png" mode></image></view></view><evaluate-list vue-id="4df589b9-2" eval-arr="{{evalArr}}" isEval="{{true}}" isShow="{{false}}" len="{{2}}" bind:__l="__l"></evaluate-list></view></block><view class="disbcac padding-sx40"><view class="gouwcxian "></view><image class="margin-zy20 margin-s10 gouwchh" src="/static/img/gouwc/heh.png" mode></image><view class="bold fon32">商品详情</view><view class="gouwcxian margin-z20"></view></view><view class="padding20 bacb"><view class="fon32 bold margin-sx10" style="color:#353535;">规格与包装</view><view class="disba fon24 color6 flw"><block wx:if="{{proDetail.brand_name!=''}}"><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;"><text>品牌</text></view><view class="flexs clips1">{{"：\t"+proDetail.brand_name+''}}</view></view></block><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">商品编号</view><view class="clips1">{{"：\t"+proDetailTwo.coding}}</view></view><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">商品名称</view><view class="clips1">{{"：\t"+proDetail.name}}</view></view><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">类别</view><view class="flexs clips1">{{"：\t"+proDetail.category_name}}</view></view><block wx:for="{{proDetailTwo.own_spec}}" wx:for-item="itemspec" wx:for-index="indexspec" wx:key="indexspec"><block><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">{{itemspec.name}}</view><view class="flexs clips1">{{"："+itemspec.value+itemspec.unit}}</view></view></block></block></view><view class="margin-s20"><rich-text nodes="{{detailCon}}"></rich-text></view></view><view class="disbcac padding-sx40"><view class="gouwcxian "></view><image class="margin-zy20 margin-s10 gouwchh" src="/static/img/gouwc/heh.png" mode></image><view class="bold fon32">猜你喜欢</view><view class="gouwcxian margin-z20"></view></view><twocolu-list vue-id="4df589b9-3" dataList="{{dataList}}" data-event-opts="{{[['^addChe',[['addChe']]]]}}" bind:addChe="__e" bind:__l="__l"></twocolu-list><block wx:if="{{showShare}}"><button style="border:none;" data-name="shareBtn" open-type="share" plain="true"><image class="zIn5 share animated pulse infinite" src="/static/img/product/share.png" mode></image></button></block><bottomkf vue-id="4df589b9-4" detail="{{proDetail}}" sku_img="{{sku_img}}" data-event-opts="{{[['^diaoq',[['proDetailEv']]]]}}" bind:diaoq="__e" bind:__l="__l"></bottomkf><back-top vue-id="4df589b9-5" showTop="{{showTop}}" data-event-opts="{{[['^backTop',[['backTop']]]]}}" bind:backTop="__e" bind:__l="__l"></back-top></view></block><block wx:if="{{xiaj}}"><view class="zanwu">该商品已下架，将自动返回</view></block></view>
+<view class="padding-x120"><status-nav vue-id="4df589b9-1" statusBackw="{{true}}" whereCome="{{whereCome*1}}" statusTitle="{{true}}" title-val="{{titleVal}}" tabcolor="#ffffff" bind:__l="__l"></status-nav><block wx:if="{{pageShow}}"><view><view class="bacb padding-x20" style="{{'padding-top:'+(statusHNH+10+'px')+';'}}"><image style="height:682rpx;width:100%;margin-top:20rpx;" src="{{zhuImg}}" mode="aspectFit"></image><view class="margin20"><view class="disba"><block wx:if="{{user_type!='personal'}}"><view><view class="colorf78 fon24 bold">￥<text class="fon36">{{proDetailTwo.cur_price/100}}</text>.00</view><view class="color9 fon24 dis">原价<text style="text-decoration:line-through;">{{"￥"+proDetailTwo.price/100+".00"}}</text></view></view></block><block wx:if="{{user_type=='personal'}}"><view class="colorf78 fon24 bold">￥<text class="fon36">{{proDetailTwo.price/100}}</text>.00</view></block><view data-event-opts="{{[['tap',[['collection',['$0'],['proDetail.id']]]]]}}" class="discc" bindtap="__e"><block wx:if="{{isCollection}}"><image style="width:40rpx;height:38rpx;" src="/static/img/public/shouc.png" mode></image></block><block wx:else><image class="animated bounceIn" style="width:40rpx;height:38rpx;" src="/static/img/public/shoucactive.png" mode></image></block><view class="fon24 color9 margin-s10">收藏</view></view></view><view class="color33 fon32 margin-sx16 clips2">{{proDetail.name}}</view><view class="fon24 color9">{{proDetail.sub_title}}</view></view></view><block wx:if="{{user_type!='personal'}}"><view class="margin-s20 bacb"><view class="disba padding-sx20 padding-zy20"><view class="fon32 bold">{{"商品评价("+evalTotal+")"}}</view><view class="disac"><view data-event-opts="{{[['tap',[['checkAllp',['$0'],['proDetail.id']]]]]}}" class="fon26 color9 margin-y10" bindtap="__e">查看全部</view><image style="width:12rpx;height:22rpx;" src="/static/img/my/youj.png" mode></image></view></view><evaluate-list vue-id="4df589b9-2" eval-arr="{{evalArr}}" isEval="{{true}}" isShow="{{false}}" len="{{2}}" bind:__l="__l"></evaluate-list></view></block><view class="disbcac padding-sx40"><view class="gouwcxian "></view><image class="margin-zy20 margin-s10 gouwchh" src="/static/img/gouwc/heh.png" mode></image><view class="bold fon32">商品详情</view><view class="gouwcxian margin-z20"></view></view><view class="padding20 bacb"><view class="fon32 bold margin-sx10" style="color:#353535;">规格与包装</view><view class="disba fon24 color6 flw"><block wx:if="{{proDetail.brand_name!=''}}"><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;"><text>品牌</text></view><view class="flexs clips1">{{"：\t"+proDetail.brand_name+''}}</view></view></block><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">商品编号</view><view class="clips1">{{"：\t"+proDetailTwo.coding}}</view></view><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">商品名称</view><view class="clips1">{{"：\t"+proDetail.name}}</view></view><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">类别</view><view class="flexs clips1">{{"：\t"+proDetail.category_name}}</view></view><block wx:for="{{proDetailTwo.own_spec}}" wx:for-item="itemspec" wx:for-index="indexspec" wx:key="indexspec"><block><view class="disac margin-x10" style="width:50%;"><view class="flexs" style="width:32%;">{{itemspec.name}}</view><view class="flexs clips1">{{"："+itemspec.value+itemspec.unit}}</view></view></block></block></view><view class="margin-s20"><rich-text nodes="{{detailCon}}"></rich-text></view></view><view class="disbcac padding-sx40"><view class="gouwcxian "></view><image class="margin-zy20 margin-s10 gouwchh" src="/static/img/gouwc/heh.png" mode></image><view class="bold fon32">猜你喜欢</view><view class="gouwcxian margin-z20"></view></view><twocolu-list vue-id="4df589b9-3" dataList="{{dataList}}" data-event-opts="{{[['^addChe',[['addChe']]]]}}" bind:addChe="__e" bind:__l="__l"></twocolu-list><block wx:if="{{showShare}}"><button style="border:none;" data-name="shareBtn" open-type="share" plain="true"><image class="zIn5 share animated pulse infinite" src="/static/img/product/share.png" mode></image></button></block><bottomkf vue-id="4df589b9-4" detail="{{proDetail}}" sku_img="{{sku_img}}" data-event-opts="{{[['^diaoq',[['proDetailEv']]]]}}" bind:diaoq="__e" bind:__l="__l"></bottomkf><back-top vue-id="4df589b9-5" showTop="{{showTop}}" data-event-opts="{{[['^backTop',[['backTop']]]]}}" bind:backTop="__e" bind:__l="__l"></back-top></view></block><block wx:if="{{xiaj}}"><view class="zanwu">该商品已下架，将自动返回</view></block></view>