update

manifest.json

@@ -55,7 +55,7 @@
             "urlCheck": false
         },
         "usingComponents": true,
-        "requiredPrivateInfos" : [ "getLocation" ],
+        "requiredPrivateInfos": ["getLocation", "chooseAddress"],
         "__usePrivacyCheck__": true,
         "permission": {
             "scope.userLocation": {

pages/evaluateList/index.vue

@@ -116,6 +116,7 @@ export default {
       };
 
       console.log("item", item);
+      this.orderList = [];
       this.currentTab = item;
       this.getorderList();
     },

pages/myAddress/address/index.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="page-body">
-    <div v-if="addList.length > 0">
+    <scroll-view
+      scroll-y
+      class="addressListPage"
+      v-if="addList && addList.length > 0"
+    >
       <radio-group :value="addressId" @change="checkAddress">
         <view
           class="address-card"
@@ -34,10 +38,13 @@
           </view>
         </view>
       </radio-group>
-    </div>
+    </scroll-view>
+    <view class="bottonBtnBox">
+      <view class="getWxAddress" @click="handleGetWxAddress">导入微信地址</view>
       <navigator url="/pages/myAddress/newAdd/index" class="btn"
         >新增收货地址</navigator
       >
+    </view>
   </div>
 </template>
 
@@ -89,6 +96,11 @@ export default {
       this.setAddress(this.addressId);
       uni.navigateBack({ delta: 1 });
     },
+
+    // 跳转添加地址的详情 修改传入的参数 可以导入微信的地址
+    handleGetWxAddress() {
+      uni.navigateTo({ url: "/pages/myAddress/newAdd/index?type=getWx" });
+    },
   },
   onUnload() {
     if (this.addList.length === 0) {
@@ -106,14 +118,26 @@ export default {
       this.pageMsg.type = option.type;
     }
     // this.getList()
+    // this.handleGetWxAddress();
   },
 };
 </script>
 
 
-<style lang="stylus" scoped>
+<style lang="less" scoped>
 .page-body {
   padding: 24rpx 0;
+  width: 100vw;
+  height: 100vh;
+  box-sizing: border-box;
+}
+
+.addressListPage {
+  width: 100%;
+  height: calc(100vh - 200rpx);
+}
+.addressListPage ::-webkit-scrollbar {
+  display: none;
 }
 
 .address-card {
@@ -152,7 +176,7 @@ export default {
   color: #ffffff;
   width: 40rpx;
   text-align: center;
-  background: linear-gradient(to right, #A17356, #D8AA8B);
+  background: linear-gradient(to right, #a17356, #d8aa8b);
   border-radius: 2rpx;
   margin-left: 8rpx;
   height: 26rpx;
@@ -166,6 +190,18 @@ export default {
   text-align: right;
 }
 
+.bottonBtnBox {
+  width: 100%;
+  height: 200rpx;
+  box-sizing: border-box;
+  padding-top: 12rpx;
+  .getWxAddress {
+    width: 100%;
+    text-align: center;
+    margin-bottom: 12rpx;
+    font-size: 26rpx;
+  }
+
   .btn {
     height: 88rpx;
     width: 90%;
@@ -174,10 +210,12 @@ export default {
     color: #f0dccf;
     text-align: center;
     font-size: 30rpx;
-  position: fixed;
+    margin-left: 5%;
-  bottom: 32rpx;
+    // position: fixed;
-  transform: translateX(-50%);
+    // bottom: 32rpx;
-  left: 50%;
+    // transform: translateX(-50%);
+    // left: 50%;
     border-radius: 12rpx;
   }
+}
 </style>

pages/myAddress/newAdd/index.vue

@@ -4,15 +4,32 @@
       <div class="adress-content">
         <span class="content-title">收货人</span>
         <div class="content-input borbottom">
-          <input type="text" placeholder="请填写收货人姓名" @input="bindKeyInput($event, 'userName')"
+          <input
-            :value="saveMsg.userName" />
+            type="text"
+            placeholder="请填写收货人姓名"
+            @input="bindKeyInput($event, 'userName')"
+            :value="saveMsg.userName"
+          />
         </div>
       </div>
       <div class="adress-content">
         <span class="content-title"></span>
-        <radio-group :value="saveMsg.userSex" @change="changRadio" class="radio-box borbottom">
+        <radio-group
-          <view class="radio-list" v-for="(item, index) in sexList" :key="index">
+          :value="saveMsg.userSex"
-            <radio :value="item.value" color="#CAA97F" :checked="item.isChecked" @click="getSex(item)" />
+          @change="changRadio"
+          class="radio-box borbottom"
+        >
+          <view
+            class="radio-list"
+            v-for="(item, index) in sexList"
+            :key="index"
+          >
+            <radio
+              :value="item.value"
+              color="#CAA97F"
+              :checked="item.isChecked"
+              @click="getSex(item)"
+            />
             <text class="radio-unit">{{ item.name }}</text>
           </view>
         </radio-group>
@@ -20,31 +37,48 @@
       <div class="adress-content borbottom">
         <span class="content-title">手机号</span>
         <div class="content-input">
-          <input type="number" maxlength="11" placeholder="请填写收货人手机号" @input="bindKeyInput($event, 'mobilePhone')"
+          <input
-            :value="saveMsg.mobilePhone" />
+            type="number"
+            maxlength="11"
+            placeholder="请填写收货人手机号"
+            @input="bindKeyInput($event, 'mobilePhone')"
+            :value="saveMsg.mobilePhone"
+          />
         </div>
       </div>
       <view class="adress-content borbottom">
         <text class="content-title">收货地址</text>
         <view class="content-input address-content" @click="handleShowPopup">
           {{ saveMsg.address }}
-          <image src="https://cdn-icons-png.flaticon.com/512/545/545682.png"
+          <image
-            style="width: 28rpx; height: 28rpx; margin-left: 12rpx" />
+            src="https://cdn-icons-png.flaticon.com/512/545/545682.png"
+            style="width: 28rpx; height: 28rpx; margin-left: 12rpx"
+          />
         </view>
       </view>
 
       <div class="textarea-content borbottom">
         <span class="content-title">详细地址</span>
         <div class="content-input">
-          <textarea auto-height placeholder="例如：花园小区9号楼三单元202" @input="bindKeyInput($event, 'doorplate')"
+          <textarea
-            :value="saveMsg.doorplate"></textarea>
+            auto-height
+            placeholder="例如：花园小区9号楼三单元202"
+            @input="bindKeyInput($event, 'doorplate')"
+            :value="saveMsg.doorplate"
+          ></textarea>
         </div>
       </div>
       <div class="adress-content borbottom">
         <span class="content-title">标签</span>
         <div class="content-input tip-content">
-          <span v-for="(u, i) in tipCodes" :key="i" class="tip-tag" :class="{ active: u.isChecked }"
+          <span
-            @click="tagClick(u)">{{ u.name }}</span>
+            v-for="(u, i) in tipCodes"
+            :key="i"
+            class="tip-tag"
+            :class="{ active: u.isChecked }"
+            @click="tagClick(u)"
+            >{{ u.name }}</span
+          >
         </div>
       </div>
       <div class="moren-content">
@@ -52,7 +86,13 @@
           <p>设为默认地址</p>
           <p class="moren-text">每次购物时会优先选定该地址，方便您轻松购物</p>
         </div>
-        <switch :checked="saveMsg.isDefault" activeColor="#07c160" inactiveColor="#fff" :size="30" @change="onChange" />
+        <switch
+          :checked="saveMsg.isDefault"
+          activeColor="#07c160"
+          inactiveColor="#fff"
+          :size="30"
+          @change="onChange"
+        />
         <!-- <van-switch
           :checked="saveMsg.isDefault"
           active-color="#07c160"
@@ -64,25 +104,46 @@
     </div>
     <div class="save-btn" @click="checkFn">保存并使用</div>
     <div class="del-btn" @click="deleteFn" v-if="pageMsg.id">删除地址</div>
-    <uni-popup :show="pageMsg.isSelect" position="bottom" overlay="false" @close="handleClosePopup" ref="popup"
+    <uni-popup
-      :safe-area="false" custom-style="height: 760rpx;">
+      :show="pageMsg.isSelect"
+      position="bottom"
+      overlay="false"
+      @close="handleClosePopup"
+      ref="popup"
+      :safe-area="false"
+      custom-style="height: 760rpx;"
+    >
       <div class="addressSelecct">
         <div class="addressTitle">
           <span class="cancelText" @click="handleClosePopup">取消</span>
           <span class="confirmText" @click="getAddress">确认</span>
         </div>
 
-        <picker-view :value="addressSelectIndex" @change="areaChange" class="picker-view">
+        <picker-view
+          :value="addressSelectIndex"
+          @change="areaChange"
+          class="picker-view"
+        >
           <picker-view-column>
             <view class="item" v-for="(item, index) in areaData" :key="index">{{
               item.name
             }}</view>
           </picker-view-column>
           <picker-view-column>
-            <view class="item" v-for="(item, index) in city_list" :key="index">{{ item.name }}</view>
+            <view
+              class="item"
+              v-for="(item, index) in city_list"
+              :key="index"
+              >{{ item.name }}</view
+            >
           </picker-view-column>
           <picker-view-column>
-            <view class="item" v-for="(item, index) in county_list" :key="index">{{ item.name }}</view>
+            <view
+              class="item"
+              v-for="(item, index) in county_list"
+              :key="index"
+              >{{ item.name }}</view
+            >
           </picker-view-column>
         </picker-view>
 
@@ -255,8 +316,8 @@ export default {
         msg = "更新成功";
       }
       arr.requestType = "application/x-www-form-urlencoded";
-
       arr.isDefault = Number(arr.isDefault);
+      console.log("arr", arr);
       this.$api.postCoop(arr).then(function (res) {
         if (res.ResultCode === "100") {
           uni.showToast({
@@ -352,6 +413,87 @@ export default {
         this.saveMsg.mobilePhone = this.user.MEMBERSHIP_MOBILEPHONE;
       }
     },
+    // 拿到微信地址
+    handleGetWxAddress() {
+      let _this = this;
+      wx.authorize({
+        scope: "scope.address",
+        success() {
+          wx.chooseAddress({
+            success(res) {
+              console.log("this.addressSelectIndex", _this.addressSelectIndex);
+              console.log("areaData", _this.areaData);
+              console.log("county_list", _this.county_list);
+              let areaIndex = 0;
+              let cityIndex = 0;
+              let countyIndex = 0;
+              console.log("21", res.provinceName.split("省")[0]);
+
+              if (_this.areaData && _this.areaData.length > 0) {
+                _this.areaData.forEach((item, index) => {
+                  let name = item.name;
+                  if (item.name.indexOf("省") === -1) {
+                    name = name + "省";
+                  }
+                  if (name === res.provinceName) {
+                    areaIndex = index;
+                  }
+                });
+              }
+
+              _this.city_list = _this.areaData[areaIndex].children;
+              console.log("city_list", _this.city_list);
+
+              if (_this.city_list && _this.city_list.length > 0) {
+                _this.city_list.forEach((item, index) => {
+                  let name = item.name;
+                  if (item.name.indexOf("市") === -1) {
+                    name = name + "市";
+                  }
+                  if (name === res.cityName) {
+                    cityIndex = index;
+                  }
+                });
+              }
+              _this.county_list = _this.city_list[cityIndex].children;
+              if (_this.county_list && _this.county_list.length > 0) {
+                _this.county_list.forEach((item, index) => {
+                  let name = item.name;
+                  if (name === res.countyName) {
+                    countyIndex = index;
+                  }
+                });
+              }
+
+              console.log("countyIndex", countyIndex);
+              _this.addressSelectIndex = [areaIndex, cityIndex, countyIndex];
+
+              _this.saveMsg.userName = res.userName;
+              _this.saveMsg.mobilePhone = res.telNumber;
+              _this.saveMsg.address =
+                res.provinceName + res.cityName + res.countyName;
+              _this.saveMsg.doorplate = res.detailInfo;
+
+              console.log(res); // 返回用户选择的收货地址信息
+              // res 包含的字段
+              // res.userName // 收货人姓名
+              // res.postalCode // 邮政编码
+              // res.provinceName // 省
+              // res.cityName // 市
+              // res.countyName // 区
+              // res.detailInfo // 详细地址
+              // res.telNumber // 联系电话
+            },
+            fail(err) {
+              console.log(err);
+            },
+          });
+        },
+        fail() {
+          console.log("用户授权失败");
+        },
+      });
+    },
   },
   onUnload() {
     this.saveMsg = {
@@ -369,15 +511,21 @@ export default {
   },
   onLoad(option) {
     this.pageMsg.id = option.id || "";
-    if (option.id) {
-      this.getMsg();
-    } else {
-      this.loadIndustry();
-    }
     this.city_list = this.areaData[0].children;
     this.county_list = this.city_list[0].children;
     console.log("this.city_list", this.city_list);
     console.log("this.county_list", this.county_list);
+    if (option.id) {
+      this.getMsg();
+    } else {
+      if (option.type === "getWx") {
+        // 导入微信的地址
+        this.handleGetWxAddress();
+      } else {
+        // 原本的老方法
+        this.loadIndustry();
+      }
+    }
   },
 };
 </script>

pages/order/orderdetail/index.vue

@@ -50,7 +50,13 @@
         >
           <!--  orderInfo.SALEBILL_STATE !== 1005 &&
             orderInfo.SALEBILL_STATE !== 1010 && -->
-          <div class="continu-btn" @click="handleRefund">发起退款</div>
+          <div
+            class="continu-btn"
+            @click="handleRefund"
+            v-if="orderInfo.SALEBILL_TYPE !== 3001"
+          >
+            发起退款
+          </div>
           <!-- <div class="back-btn" @click="goShop" v-if="orderInfo.SALEBILL_STATE!=1010">再来一单</div> -->
           <div
             class="continu-btn"

pages/serviceDetail/index.vue

@@ -1069,8 +1069,11 @@ export default {
     },
     // 返回上级页面
     handleBack() {
-      uni.navigateBack({
+      // uni.navigateBack({
-        delta: 1,
+      //   delta: 1,
+      // });
+      uni.switchTab({
+        url: "/pages/index/index",
       });
     },
     // 拿到精选商家数据

pages/shopMallPage/index/index.vue

@@ -1,6 +1,14 @@
 <template>
-  <view class="main">
+  <scroll-view
+    class="main"
+    scroll-y
+    @scroll="handlePageScroll"
+    :scroll-into-view="scrollView"
+    scroll-with-animation
+    @scrolltolower="handleScrollBottom"
+  >
     <div
+      id="navItem"
       class="header"
       :style="{
         paddingTop: menu.top + menu.height + 'px',
@@ -500,6 +508,8 @@
 
         <!-- 随机商品 -->
         <div class="shopLovely" v-if="pageType === 'UnionMall'">
+          <!-- :style="{ paddingBottom: `${50}px` }" -->
+
           <view class="shopLovelyTop">
             <text class="shopLovelyTitle">猜你喜欢</text>
             <view class="shopLovelyRight" @click="handleShowPricePopup">
@@ -556,8 +566,10 @@
               </div>
             </view>
           </view>
-          <view class="inBottom" v-if="shopMsg.isOver">
+          <view class="inBottom" v-if="showShopList && showShopList.length > 0">
-            <text class="bottomText">我是有底线的</text>
+            <text class="bottomText">{{
+              shopMsg.isOver ? "我是有底线的" : "下拉加载更多"
+            }}</text>
           </view>
         </div>
       </div>
@@ -634,12 +646,17 @@
       </view>
     </uni-popup>
 
+    <!-- 回到顶部 -->
+    <view class="backTopBox" v-if="showBackTop" @click="handleGoBack">
+      <image class="backIcon" src="/static/images/home/backTopIcon.png" />
+    </view>
+
     <shop-tabbar
       :page="`/pages/shopMallPage/index/index`"
       :pageType="pageType"
       :shopCarLength="shopCarListCount"
     />
-  </view>
+  </scroll-view>
 </template>
 
 <script>
@@ -692,6 +709,9 @@ export default {
       ],
       isFirst: false,
       searchShopName: "", // 搜索商品的名称
+      showBackTop: false, // 页面滚动距离
+      scrollView: "",
+      safeHeight: 0, // ios的安全距离
     };
   },
   async onLoad(query) {
@@ -706,6 +726,10 @@ export default {
       this.$refs.noticeRef.open("center");
       uni.setStorageSync("firstEntry", "2");
     }
+    let safeHeight = uni.getStorageSync("safeHeight");
+    if (safeHeight) {
+      this.safeHeight = Number(safeHeight);
+    }
 
     if (query.pageType === "UnionMall") {
       // 拿到顶部商品大类的方法
@@ -821,6 +845,23 @@ export default {
     };
   },
   methods: {
+    // 滚动到底部 加载更多的方法
+    handleScrollBottom() {
+      this.handleToBottom();
+    },
+    // 回到顶部
+    handleGoBack() {
+      this.scrollView = "navItem";
+    },
+    handlePageScroll(e) {
+      this.pageScrollNumber = Number(e.detail.scrollTop);
+      if (Number(e.detail.scrollTop) > 100) {
+        this.showBackTop = true;
+      } else {
+        this.scrollView = "";
+        this.showBackTop = false;
+      }
+    },
     handleHidePopup() {
       this.$refs.noticeRef.close();
     },
@@ -1890,6 +1931,10 @@ export default {
         }
       }
 
+      .advertisementContentBox ::-webkit-scrollbar {
+        display: none;
+      }
+
       .sortBox {
         width: 100%;
         display: flex;
@@ -2131,6 +2176,10 @@ export default {
             }
           }
         }
+
+        .advertisementItemContent ::-webkit-scrollbar {
+          display: none;
+        }
       }
 
       .advertisementItemUnionMall {
@@ -2576,6 +2625,7 @@ export default {
           display: flex;
           align-items: center;
           justify-content: center;
+          padding-bottom: 12rpx;
           .bottomText {
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
@@ -2616,6 +2666,7 @@ export default {
         display: flex;
         align-items: center;
         justify-content: center;
+        padding-bottom: 12rpx;
         .bottomText {
           font-family: PingFangSC, PingFang SC;
           font-weight: 400;
@@ -2782,5 +2833,23 @@ export default {
       display: none;
     }
   }
+
+  .backTopBox {
+    width: 40px;
+    height: 40px;
+    border-radius: 50%;
+    background: #fff;
+    position: fixed;
+    right: 32px;
+    bottom: 150px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 999;
+    .backIcon {
+      width: 20px;
+      height: 20px;
+    }
+  }
 }
 </style>

pages/shopMallPage/shopType/index.vue

@@ -1528,6 +1528,10 @@ export default {
       }
     }
 
+    .bigTabBox ::-webkit-scrollbar {
+      display: none;
+    }
+
     .shopListBox {
       width: 100%;
       height: calc(100% - 95px);
@@ -1594,6 +1598,10 @@ export default {
             background: #1890ff;
           }
         }
+
+        .scrollShopBox ::-webkit-scrollbar {
+          display: none;
+        }
       }
 
       .smallShopList::-webkit-scrollbar {
@@ -1618,6 +1626,10 @@ export default {
           }
         }
 
+        .shopDetailScroll ::-webkit-scrollbar {
+          display: none;
+        }
+
         .shopDetailItem {
           width: 100%;
           height: 104px;

pages/shopMallPage/user/index.vue

@@ -374,6 +374,7 @@ export default {
       box-sizing: border-box;
       padding: 24rpx;
       border-radius: 16rpx;
+      margin-top: 24rpx;
 
       .orderTitle {
         font-family: PingFangSC, PingFang SC;

pages/shopPages/shopList/index.vue

@@ -129,6 +129,11 @@ export default {
   methods: {
     // 找到对应类型的商品列表
     async handleGetShopList(type) {
+      // 如果已经到底了 就调用
+      if (this.shopMsg.isOver) {
+        return;
+      }
+
       uni.showLoading({
         title: "加载中...",
       });
@@ -533,6 +538,9 @@ export default {
 
   .content ::-webkit-scrollbar {
     display: none;
+    width: 0;
+    height: 0;
+    background: transparent;
   }
 }
 </style>

unpackage/dist/dev/mp-weixin/app.json

@@ -178,7 +178,8 @@
     ]
   },
   "requiredPrivateInfos": [
-    "getLocation"
+    "getLocation",
+    "chooseAddress"
   ],
   "__usePrivacyCheck__": true,
   "permission": {

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1757,7 +1757,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -20271,7 +20271,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -20292,14 +20292,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -20395,7 +20395,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"caiyunyi","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));

unpackage/dist/dev/mp-weixin/pages/evaluateList/index.js

@@ -250,6 +250,7 @@ var _default = {
         isOver: false
       };
       console.log("item", item);
+      this.orderList = [];
       this.currentTab = item;
       this.getorderList();
     },

unpackage/dist/dev/mp-weixin/pages/myAddress/address/index.js

@@ -33,7 +33,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _index_vue_vue_type_template_id_0a907f67_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=0a907f67&scoped=true& */ 197);
 /* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 199);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _index_vue_vue_type_style_index_0_id_0a907f67_lang_stylus_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./index.vue?vue&type=style&index=0&id=0a907f67&lang=stylus&scoped=true& */ 201);
+/* harmony import */ var _index_vue_vue_type_style_index_0_id_0a907f67_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./index.vue?vue&type=style&index=0&id=0a907f67&lang=less&scoped=true& */ 201);
 /* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 36);
 
 var renderjs
@@ -102,7 +102,7 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var g0 = _vm.addList.length
+  var g0 = _vm.addList && _vm.addList.length > 0
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -202,6 +202,12 @@ var _default = {
       uni.navigateBack({
         delta: 1
       });
+    },
+    // 跳转添加地址的详情 修改传入的参数 可以导入微信的地址
+    handleGetWxAddress: function handleGetWxAddress() {
+      uni.navigateTo({
+        url: "/pages/myAddress/newAdd/index?type=getWx"
+      });
     }
   }),
   onUnload: function onUnload() {
@@ -220,6 +226,7 @@ var _default = {
       this.pageMsg.type = option.type;
     }
     // this.getList()
+    // this.handleGetWxAddress();
   }
 };
 exports.default = _default;
@@ -228,25 +235,25 @@ exports.default = _default;
 /***/ }),
 
 /***/ 201:
-/*!*************************************************************************************************************************************!*\
+/*!***********************************************************************************************************************************!*\
-  !*** D:/workfile/minprogram/caiyunyi/pages/myAddress/address/index.vue?vue&type=style&index=0&id=0a907f67&lang=stylus&scoped=true& ***!
+  !*** D:/workfile/minprogram/caiyunyi/pages/myAddress/address/index.vue?vue&type=style&index=0&id=0a907f67&lang=less&scoped=true& ***!
-  \*************************************************************************************************************************************/
+  \***********************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_11_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_stylus_loader_index_js_ref_11_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_11_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_id_0a907f67_lang_stylus_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--11-oneOf-1-0!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--11-oneOf-1-1!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--11-oneOf-1-2!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--11-oneOf-1-3!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/stylus-loader??ref--11-oneOf-1-4!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--11-oneOf-1-5!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=style&index=0&id=0a907f67&lang=stylus&scoped=true& */ 202);
+/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_id_0a907f67_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--10-oneOf-1-0!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--10-oneOf-1-1!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--10-oneOf-1-2!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--10-oneOf-1-3!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/less-loader/dist/cjs.js??ref--10-oneOf-1-4!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--10-oneOf-1-5!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../program files/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=style&index=0&id=0a907f67&lang=less&scoped=true& */ 202);
-/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_11_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_stylus_loader_index_js_ref_11_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_11_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_id_0a907f67_lang_stylus_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_11_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_stylus_loader_index_js_ref_11_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_11_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_id_0a907f67_lang_stylus_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_id_0a907f67_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_id_0a907f67_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_11_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_stylus_loader_index_js_ref_11_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_11_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_id_0a907f67_lang_stylus_scoped_true___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_11_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_stylus_loader_index_js_ref_11_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_11_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_id_0a907f67_lang_stylus_scoped_true___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_id_0a907f67_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_id_0a907f67_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_11_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_stylus_loader_index_js_ref_11_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_11_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_id_0a907f67_lang_stylus_scoped_true___WEBPACK_IMPORTED_MODULE_0___default.a); 
+ /* harmony default export */ __webpack_exports__["default"] = (_program_files_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_program_files_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_2_program_files_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_program_files_HBuilderX_plugins_uniapp_cli_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_10_oneOf_1_5_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_program_files_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_style_index_0_id_0a907f67_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
 /***/ 202:
-/*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+/*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--11-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--11-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--11-oneOf-1-2!./node_modules/postcss-loader/src??ref--11-oneOf-1-3!./node_modules/stylus-loader??ref--11-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--11-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/workfile/minprogram/caiyunyi/pages/myAddress/address/index.vue?vue&type=style&index=0&id=0a907f67&lang=stylus&scoped=true& ***!
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--10-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--10-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--10-oneOf-1-2!./node_modules/postcss-loader/src??ref--10-oneOf-1-3!./node_modules/less-loader/dist/cjs.js??ref--10-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--10-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/workfile/minprogram/caiyunyi/pages/myAddress/address/index.vue?vue&type=style&index=0&id=0a907f67&lang=less&scoped=true& ***!
-  \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+  \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/pages/myAddress/address/index.wxml

@@ -1 +1 @@
-<view class="page-body _div data-v-0a907f67"><block wx:if="{{$root.g0>0}}"><view class="_div data-v-0a907f67"><radio-group value="{{addressId}}" data-event-opts="{{[['change',[['checkAddress',['$event']]]]]}}" bindchange="__e" class="data-v-0a907f67"><block wx:for="{{addList}}" wx:for-item="n" wx:for-index="__i0__" wx:key="MEMBERADDRESS_ID"><view data-event-opts="{{[['tap',[['checkOrEdit',['$0'],[[['addList','MEMBERADDRESS_ID',n.MEMBERADDRESS_ID,'MEMBERADDRESS_ID']]]]]]]}}" class="address-card data-v-0a907f67" bindtap="__e"><block wx:if="{{pageMsg.type!==0}}"><view style="flex:1.5;text-align:right;padding-left:16rpx;" class="data-v-0a907f67"><radio value="{{n.MEMBERADDRESS_ID}}" color="#CAA97F" class="data-v-0a907f67"></radio></view></block><view class="card-left data-v-0a907f67"><view class="address-title data-v-0a907f67">{{''+(n.ADDRESS+n.DOORPLATE)+''}}<block wx:if="{{n.ISDEFAULT===1}}"><text class="tip-moren data-v-0a907f67">默认</text></block></view><view class="address-other data-v-0a907f67">{{''+(n.USER_NAME+n.USER_SEX_TEXT+" "+n.MOBILEPHONE)+''}}</view></view><view data-event-opts="{{[['tap',[['editAddress',['$0'],[[['addList','MEMBERADDRESS_ID',n.MEMBERADDRESS_ID,'MEMBERADDRESS_ID']]]]]]]}}" class="card-right data-v-0a907f67" catchtap="__e"><image style="width:28rpx;height:28rpx;" src="https://eshangtech.com/ShopICO/icos/address-edit.png" class="data-v-0a907f67"></image></view></view></block></radio-group></view></block><navigator class="btn data-v-0a907f67" url="/pages/myAddress/newAdd/index">新增收货地址</navigator></view>
+<view class="page-body _div data-v-0a907f67"><block wx:if="{{$root.g0}}"><scroll-view class="addressListPage data-v-0a907f67" scroll-y="{{true}}"><radio-group value="{{addressId}}" data-event-opts="{{[['change',[['checkAddress',['$event']]]]]}}" bindchange="__e" class="data-v-0a907f67"><block wx:for="{{addList}}" wx:for-item="n" wx:for-index="__i0__" wx:key="MEMBERADDRESS_ID"><view data-event-opts="{{[['tap',[['checkOrEdit',['$0'],[[['addList','MEMBERADDRESS_ID',n.MEMBERADDRESS_ID,'MEMBERADDRESS_ID']]]]]]]}}" class="address-card data-v-0a907f67" bindtap="__e"><block wx:if="{{pageMsg.type!==0}}"><view style="flex:1.5;text-align:right;padding-left:16rpx;" class="data-v-0a907f67"><radio value="{{n.MEMBERADDRESS_ID}}" color="#CAA97F" class="data-v-0a907f67"></radio></view></block><view class="card-left data-v-0a907f67"><view class="address-title data-v-0a907f67">{{''+(n.ADDRESS+n.DOORPLATE)+''}}<block wx:if="{{n.ISDEFAULT===1}}"><text class="tip-moren data-v-0a907f67">默认</text></block></view><view class="address-other data-v-0a907f67">{{''+(n.USER_NAME+n.USER_SEX_TEXT+" "+n.MOBILEPHONE)+''}}</view></view><view data-event-opts="{{[['tap',[['editAddress',['$0'],[[['addList','MEMBERADDRESS_ID',n.MEMBERADDRESS_ID,'MEMBERADDRESS_ID']]]]]]]}}" class="card-right data-v-0a907f67" catchtap="__e"><image style="width:28rpx;height:28rpx;" src="https://eshangtech.com/ShopICO/icos/address-edit.png" class="data-v-0a907f67"></image></view></view></block></radio-group></scroll-view></block><view class="bottonBtnBox data-v-0a907f67"><view data-event-opts="{{[['tap',[['handleGetWxAddress',['$event']]]]]}}" class="getWxAddress data-v-0a907f67" bindtap="__e">导入微信地址</view><navigator class="btn data-v-0a907f67" url="/pages/myAddress/newAdd/index">新增收货地址</navigator></view></view>

unpackage/dist/dev/mp-weixin/pages/myAddress/address/index.wxss

@@ -1,5 +1,15 @@
 .page-body.data-v-0a907f67 {
   padding: 24rpx 0;
+  width: 100vw;
+  height: 100vh;
+  box-sizing: border-box;
+}
+.addressListPage.data-v-0a907f67 {
+  width: 100%;
+  height: calc(100vh - 200rpx);
+}
+.addressListPage.data-v-0a907f67 ::-webkit-scrollbar {
+  display: none;
 }
 .address-card.data-v-0a907f67 {
   display: flex;
@@ -29,7 +39,7 @@
 }
 .tip-moren.data-v-0a907f67 {
   font-size: 18rpx;
-  color: #fff;
+  color: #ffffff;
   width: 40rpx;
   text-align: center;
   background: linear-gradient(to right, #a17356, #d8aa8b);
@@ -44,7 +54,19 @@
   padding-right: 32rpx;
   text-align: right;
 }
-.btn.data-v-0a907f67 {
+.bottonBtnBox.data-v-0a907f67 {
+  width: 100%;
+  height: 200rpx;
+  box-sizing: border-box;
+  padding-top: 12rpx;
+}
+.bottonBtnBox .getWxAddress.data-v-0a907f67 {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 12rpx;
+  font-size: 26rpx;
+}
+.bottonBtnBox .btn.data-v-0a907f67 {
   height: 88rpx;
   width: 90%;
   line-height: 88rpx;
@@ -52,11 +74,7 @@
   color: #f0dccf;
   text-align: center;
   font-size: 30rpx;
-  position: fixed;
+  margin-left: 5%;
-  bottom: 32rpx;
-  -webkit-transform: translateX(-50%);
-          transform: translateX(-50%);
-  left: 50%;
   border-radius: 12rpx;
 }
 

unpackage/dist/dev/mp-weixin/pages/myAddress/newAdd/index.js

@@ -158,7 +158,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {
+/* WEBPACK VAR INJECTION */(function(uni, wx) {
 
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
@@ -310,6 +310,7 @@ var _default = {
       }
       arr.requestType = "application/x-www-form-urlencoded";
       arr.isDefault = Number(arr.isDefault);
+      console.log("arr", arr);
       this.$api.postCoop(arr).then(function (res) {
         if (res.ResultCode === "100") {
           uni.showToast({
@@ -403,6 +404,80 @@ var _default = {
         this.saveMsg.userName = this.user.MEMBERSHIP_NAME;
         this.saveMsg.mobilePhone = this.user.MEMBERSHIP_MOBILEPHONE;
       }
+    },
+    // 拿到微信地址
+    handleGetWxAddress: function handleGetWxAddress() {
+      var _this = this;
+      wx.authorize({
+        scope: "scope.address",
+        success: function success() {
+          wx.chooseAddress({
+            success: function success(res) {
+              console.log("this.addressSelectIndex", _this.addressSelectIndex);
+              console.log("areaData", _this.areaData);
+              console.log("county_list", _this.county_list);
+              var areaIndex = 0;
+              var cityIndex = 0;
+              var countyIndex = 0;
+              console.log("21", res.provinceName.split("省")[0]);
+              if (_this.areaData && _this.areaData.length > 0) {
+                _this.areaData.forEach(function (item, index) {
+                  var name = item.name;
+                  if (item.name.indexOf("省") === -1) {
+                    name = name + "省";
+                  }
+                  if (name === res.provinceName) {
+                    areaIndex = index;
+                  }
+                });
+              }
+              _this.city_list = _this.areaData[areaIndex].children;
+              console.log("city_list", _this.city_list);
+              if (_this.city_list && _this.city_list.length > 0) {
+                _this.city_list.forEach(function (item, index) {
+                  var name = item.name;
+                  if (item.name.indexOf("市") === -1) {
+                    name = name + "市";
+                  }
+                  if (name === res.cityName) {
+                    cityIndex = index;
+                  }
+                });
+              }
+              _this.county_list = _this.city_list[cityIndex].children;
+              if (_this.county_list && _this.county_list.length > 0) {
+                _this.county_list.forEach(function (item, index) {
+                  var name = item.name;
+                  if (name === res.countyName) {
+                    countyIndex = index;
+                  }
+                });
+              }
+              console.log("countyIndex", countyIndex);
+              _this.addressSelectIndex = [areaIndex, cityIndex, countyIndex];
+              _this.saveMsg.userName = res.userName;
+              _this.saveMsg.mobilePhone = res.telNumber;
+              _this.saveMsg.address = res.provinceName + res.cityName + res.countyName;
+              _this.saveMsg.doorplate = res.detailInfo;
+              console.log(res); // 返回用户选择的收货地址信息
+              // res 包含的字段
+              // res.userName // 收货人姓名
+              // res.postalCode // 邮政编码
+              // res.provinceName // 省
+              // res.cityName // 市
+              // res.countyName // 区
+              // res.detailInfo // 详细地址
+              // res.telNumber // 联系电话
+            },
+            fail: function fail(err) {
+              console.log(err);
+            }
+          });
+        },
+        fail: function fail() {
+          console.log("用户授权失败");
+        }
+      });
     }
   },
   onUnload: function onUnload() {
@@ -421,19 +496,25 @@ var _default = {
   },
   onLoad: function onLoad(option) {
     this.pageMsg.id = option.id || "";
-    if (option.id) {
-      this.getMsg();
-    } else {
-      this.loadIndustry();
-    }
     this.city_list = this.areaData[0].children;
     this.county_list = this.city_list[0].children;
     console.log("this.city_list", this.city_list);
     console.log("this.county_list", this.county_list);
+    if (option.id) {
+      this.getMsg();
+    } else {
+      if (option.type === "getWx") {
+        // 导入微信的地址
+        this.handleGetWxAddress();
+      } else {
+        // 原本的老方法
+        this.loadIndustry();
+      }
+    }
   }
 };
 exports.default = _default;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/wx.js */ 1)["default"]))
 
 /***/ }),
 

unpackage/dist/dev/mp-weixin/pages/serviceDetail/index.js

@@ -563,8 +563,11 @@ var _default = {
     },
     // 返回上级页面
     handleBack: function handleBack() {
-      uni.navigateBack({
+      // uni.navigateBack({
-        delta: 1
+      //   delta: 1,
+      // });
+      uni.switchTab({
+        url: "/pages/index/index"
       });
     },
     // 拿到精选商家数据

unpackage/dist/dev/mp-weixin/pages/shopMallPage/index/index.js

@@ -140,6 +140,10 @@ var render = function () {
   })
   var g4 = _vm.pageType !== "UnionMall" ? _vm.specialOffersList.length : null
   var g5 = _vm.pageType !== "UnionMall" ? _vm.todayOffersList.length : null
+  var g6 =
+    _vm.pageType === "UnionMall"
+      ? _vm.showShopList && _vm.showShopList.length > 0
+      : null
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -150,6 +154,7 @@ var render = function () {
         l0: l0,
         g4: g4,
         g5: g5,
+        g6: g6,
       },
     }
   )
@@ -292,13 +297,18 @@ var _default = {
       // 这一次的排序方法
       sortTypeList: ["COMMODITYTYPE_CODE", "COMMODITY_BARCODE", "COMMODITY_ID", "COMMODITY_EN"],
       isFirst: false,
-      searchShopName: "" // 搜索商品的名称
+      searchShopName: "",
+      // 搜索商品的名称
+      showBackTop: false,
+      // 页面滚动距离
+      scrollView: "",
+      safeHeight: 0 // ios的安全距离
     };
   },
   onLoad: function onLoad(query) {
     var _this2 = this;
     return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var firstEntry, data, typeList, obj, resList;
+      var firstEntry, safeHeight, data, typeList, obj, resList;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -313,17 +323,21 @@ var _default = {
                 _this2.$refs.noticeRef.open("center");
                 uni.setStorageSync("firstEntry", "2");
               }
+              safeHeight = uni.getStorageSync("safeHeight");
+              if (safeHeight) {
+                _this2.safeHeight = Number(safeHeight);
+              }
               if (!(query.pageType === "UnionMall")) {
-                _context.next = 20;
+                _context.next = 22;
                 break;
               }
-              _context.next = 8;
+              _context.next = 10;
               return _this2.$api.getCoop({
                 action_type: "WeChat_GetMallGoodsType",
                 ownerUnitId: 911,
                 commodityNature: 5070
               });
-            case 8:
+            case 10:
               data = _context.sent;
               console.log("handleGetShopBigType", data);
               typeList = data.Data.List || [];
@@ -384,19 +398,19 @@ var _default = {
               // ];
               // 拿到工会商城的商品列表
               _this2.handleGetUnionShopList();
-              _context.next = 25;
+              _context.next = 27;
               break;
-            case 20:
-              _context.next = 22;
-              return _this2.handleGetShopBigType();
             case 22:
+              _context.next = 24;
+              return _this2.handleGetShopBigType();
+            case 24:
               // 拿到特价优惠的
               _this2.handleGetSpecialOffers();
               // 拿到今日推荐的商品列表
               _this2.handleGetTodayOffers();
               // 最下面的甄选商品
               _this2.handleGetProductsList();
-            case 25:
+            case 27:
             case "end":
               return _context.stop();
           }
@@ -440,6 +454,23 @@ var _default = {
     };
   },
   methods: {
+    // 滚动到底部 加载更多的方法
+    handleScrollBottom: function handleScrollBottom() {
+      this.handleToBottom();
+    },
+    // 回到顶部
+    handleGoBack: function handleGoBack() {
+      this.scrollView = "navItem";
+    },
+    handlePageScroll: function handlePageScroll(e) {
+      this.pageScrollNumber = Number(e.detail.scrollTop);
+      if (Number(e.detail.scrollTop) > 100) {
+        this.showBackTop = true;
+      } else {
+        this.scrollView = "";
+        this.showBackTop = false;
+      }
+    },
     handleHidePopup: function handleHidePopup() {
       this.$refs.noticeRef.close();
     },

unpackage/dist/dev/mp-weixin/pages/shopMallPage/index/index.wxss

@@ -458,6 +458,9 @@
           text-decoration-line: line-through;
   margin-top: 14rpx;
 }
+.main .pageContent .advertisement .advertisementContentBox.data-v-79c11018 ::-webkit-scrollbar {
+  display: none;
+}
 .main .pageContent .advertisement .sortBox.data-v-79c11018 {
   width: 100%;
   display: flex;
@@ -663,6 +666,9 @@
 .main .pageContent .advertisementSecond .advertisementItem .advertisementItemContent .shopItemList .shopItem .shopImgText .shopSmallText.data-v-79c11018 {
   font-size: 24rpx;
 }
+.main .pageContent .advertisementSecond .advertisementItem .advertisementItemContent.data-v-79c11018 ::-webkit-scrollbar {
+  display: none;
+}
 .main .pageContent .advertisementSecond .advertisementItemUnionMall.data-v-79c11018 {
   width: 100%;
   background: #fff;
@@ -1048,6 +1054,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  padding-bottom: 12rpx;
 }
 .main .pageContent .allShopList .shopLovely .inBottom .bottomText.data-v-79c11018 {
   font-family: PingFangSC, PingFang SC;
@@ -1083,6 +1090,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  padding-bottom: 12rpx;
 }
 .main .pageContent .allShopList .inBottom .bottomText.data-v-79c11018 {
   font-family: PingFangSC, PingFang SC;
@@ -1238,4 +1246,21 @@
 .main .noticePopup .popupContent.data-v-79c11018::-webkit-scrollbar {
   display: none;
 }
+.main .backTopBox.data-v-79c11018 {
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+  background: #fff;
+  position: fixed;
+  right: 32px;
+  bottom: 150px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 999;
+}
+.main .backTopBox .backIcon.data-v-79c11018 {
+  width: 20px;
+  height: 20px;
+}
 

unpackage/dist/dev/mp-weixin/pages/shopMallPage/shopType/index.wxss

@@ -196,6 +196,9 @@
   line-height: 36rpx;
   margin-top: 4px;
 }
+.main .pageContent .bigTabBox.data-v-36e5d840 ::-webkit-scrollbar {
+  display: none;
+}
 .main .pageContent .shopListBox.data-v-36e5d840 {
   width: 100%;
   height: calc(100% - 95px);
@@ -256,6 +259,9 @@
           transform: translateY(-50%);
   background: #1890ff;
 }
+.main .pageContent .shopListBox .smallShopList .scrollShopBox.data-v-36e5d840 ::-webkit-scrollbar {
+  display: none;
+}
 .main .pageContent .shopListBox .smallShopList.data-v-36e5d840::-webkit-scrollbar {
   display: none;
 }
@@ -275,6 +281,9 @@
   align-items: center;
   justify-content: center;
 }
+.main .pageContent .shopListBox .shopDetailList .shopDetailScroll.data-v-36e5d840 ::-webkit-scrollbar {
+  display: none;
+}
 .main .pageContent .shopListBox .shopDetailList .shopDetailItem.data-v-36e5d840 {
   width: 100%;
   height: 104px;

unpackage/dist/dev/mp-weixin/pages/shopMallPage/user/index.wxss

@@ -98,6 +98,7 @@
   box-sizing: border-box;
   padding: 24rpx;
   border-radius: 16rpx;
+  margin-top: 24rpx;
 }
 .main .content .userOrder .orderTitle.data-v-5eaf711b {
   font-family: PingFangSC, PingFang SC;

unpackage/dist/dev/mp-weixin/pages/shopPages/shopList/index.js

@@ -223,6 +223,12 @@ var _default = {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                if (!_this.shopMsg.isOver) {
+                  _context.next = 2;
+                  break;
+                }
+                return _context.abrupt("return");
+              case 2:
                 uni.showLoading({
                   title: "加载中..."
                 });
@@ -270,9 +276,9 @@ var _default = {
                     Page_Index: _this.shopMsg.pageIndex
                   };
                 }
-                _context.next = 5;
+                _context.next = 7;
                 return _this.$api.getCoop(req);
-              case 5:
+              case 7:
                 data = _context.sent;
                 oldList = [];
                 if (_this.shopList && _this.shopList.length > 0) {
@@ -307,7 +313,7 @@ var _default = {
                 console.log("shopList", shopList);
                 _this.shopList = oldList.concat(shopList);
                 uni.hideLoading();
-              case 14:
+              case 16:
               case "end":
                 return _context.stop();
             }

unpackage/dist/dev/mp-weixin/pages/shopPages/shopList/index.wxss

@@ -242,5 +242,8 @@
 }
 .main .content.data-v-8f44761e ::-webkit-scrollbar {
   display: none;
+  width: 0;
+  height: 0;
+  background: transparent;
 }