换电脑前提交

app.json

@@ -95,7 +95,7 @@
   },
   "tabBar": {
     "selectedColor": "#04358D",
-    "color": "#AAAAAA",
+    "color": "#222222",
     "list": [
       {
         "pagePath": "pages/index/index",

pages/category/category.js

@@ -10,6 +10,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    showLoading:false,
     rightView:'',
     paramsObj:{
       sort:0,
@@ -210,7 +211,8 @@ Page({
   },
   getData(data){
       this.setData({
-        thridCategoryList:[]
+        thridCategoryList:[],
+        showLoading:true
       })
       // 二级分类有商品
       if(data.productBeBound == 1){
@@ -402,6 +404,11 @@ Page({
         // distance: wx.getStorageSync('DISTANCE') || 0
       },
       callBack: (res) => {
+        setTimeout(() => {
+          this.setData({
+            showLoading:false
+          })
+        }, 500);
       console.log(res);
       let productList = res.records
       let img = ''
@@ -439,6 +446,11 @@ Page({
         shopId:this.data.testShopId||this.data.shopId
       },
       callBack: (res) => {
+        setTimeout(() => {
+          this.setData({
+            showLoading:false
+          })
+        }, 500);
       let productList = res.records
       let img = ''
       productList.map(e => {

pages/category/category.wxml

@@ -79,6 +79,10 @@
     <!-- 右侧内容start -->
     <scroll-view scroll-y="true" class='rightcontent' 	enable-passive scroll-into-view="{{rightView}}"	upper-threshold="10" 	lower-threshold="10"  scroll-top="{{topHeight}}" bindscroll="scroll"bindscrolltoupper="scrollTop" bindscrolltolower="scrollBottom">
       <!-- <text wx:if="{{subCategoryList.length>0}}" class="sub-title" >{{subCategoryList[subIndex].categoryName}}</text> -->
+    <view class="loading" wx:if="{{showLoading}}">
+      <!-- <van-icon class="icon" color="#04358D" size="50rpx" name="replay" /> -->
+      <image class="icon" src="../../images/imgs/loading-icon.png" mode=""/>
+    </view>
       <view class="right-top-box">
         <view class="thrid-type-box" wx:if="{{thridCategoryList.length>0}}">
           <view class='thrid-type-item {{thridIndex==-1?"active":""}}' data-index="-1" bind:tap="handleThrid">全部</view>

pages/category/category.wxss

@@ -224,6 +224,27 @@ scroll-view ::-webkit-scrollbar {
 }
 
 /* 右侧商品栏 */
+.loading{
+  width: 550rpx;
+  height: 70vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-shrink: 0;
+  position: fixed;
+  z-index: 99999;
+  background: #fff;
+}
+@keyframes rotato{
+  from { transform: rotate(0deg); }
+  to { transform: rotate(360deg); }
+}
+
+.loading .icon{
+  animation:  rotato .5s linear infinite;
+  width: 48rpx;
+  height: 48rpx;
+}
 
 .rightcontent {
   width: 550rpx;

pages/index/index.wxml

@@ -87,7 +87,9 @@
     【会员超福利】限时30元开卡红包好礼，速点>
   </view>
 
-  <image class="adv adv1" src="../../images/imgs/adv1.png" mode=""/>
+  <!-- <image class="adv adv1" src="../../images/imgs/adv1.png" mode=""/> -->
+  <image class="adv adv1" src="https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/IG4om2YeFJbH89c9d278123fabe00202a7e6cc0ff249.png/1.png" mode=""/>
+ 
   
 
   <!-- 通知广告end -->
@@ -126,6 +128,8 @@
     </view>
     <!-- 秒杀end -->
     <image class="adv adv2" src="../../images/imgs/adv2.png" mode=""/>
+    <!-- <image class="adv adv2" src="https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/jAiLN7O6mbd01f3bfa6f8a82096a6a6a0b12ebdca486.png/1.png" mode=""/> -->
+    
 
     <!-- 推荐 -->
     <!-- <view class="recommended-card" wx:if="{{newList.length>0}}">

project.private.config.json

@@ -466,5 +466,5 @@
       ]
     }
   },
-  "libVersion": "3.8.7"
+  "libVersion": "3.9.3"
 }

utils/config.js

@@ -2,10 +2,10 @@
 // var domain = "https://shop-h5.zswllife.cn/api"; //统一接口域名，正式环境 
 // var wsDomain = "wss://shop-h5.zswllife.cn/api"; //统一接口域名，正式环境 
 
-// var domain = "https://shop-h5.dev.zswllife.cn/api"; //统一接口域名，测试环境 
-// var wsDomain = "wss://shop-h5.dev.zswllife.cn/api"; //统一接口域名，测试环境 
-var domain = "https://shop.haimamart.com/api"; //统一接口域名，正式环境 
-var wsDomain = "wss://shop.haimamart.com/api"; //统一接口域名，正式环境 
+var domain = "https://shop-h5.dev.zswllife.cn/api"; //统一接口域名，测试环境 
+var wsDomain = "wss://shop-h5.dev.zswllife.cn/api"; //统一接口域名，测试环境 
+// var domain = "https://shop.haimamart.com/api"; //统一接口域名，正式环境 
+// var wsDomain = "wss://shop.haimamart.com/api"; //统一接口域名，正式环境 
 
 // var domain = "http://192.168.1.120:8086"; //统一接口域名，测试环境
 // var wsDomain = "ws://192.168.1.120:8086"; //统一接口域名，测试环境