update

pages/highwayHeadlines/index.vue

@@ -21,10 +21,10 @@
         </div>
         <div class="right">
 
-          <image class="leftIcon" v-if="item.ImageList && item.ImageList.length > 0"
+          <image class="leftIcon" v-if="item.ImageList && item.ImageList.length > 0" :src="item.ImageList[0].ImageUrl"
-            :src="item.ImageList[0].ImageUrl" />
+            :lazy-load="true" />
 
-          <image v-else class="leftIcon" :src="item.coverImg
+          <image v-else class="leftIcon" :lazy-load="true" :src="item.coverImg
             ? item.coverImg
             : 'https://eshangtech.com/ShopICO/no-picture.png'
             " />

pages/serviceDetail/index.vue

@@ -576,7 +576,7 @@
             <view class="rightItem">
               <view class="attractionsText">{{ item.SCENICAREA_NAME || "" }}</view>
               <view class="rightItemBox">营业时间：<text class="timeText">{{ item.SCENICAREA_OPENHOURS || ""
-                  }}</text>
+              }}</text>
               </view>
               <view class="descBox">{{ item.SCENICAREA_INFO || "" }}</view>
             </view>
@@ -618,6 +618,7 @@ export default {
         use: 0,
       }, // 充电桩数据
       nearScenic: [],// 景点列表
+      pageType: ""
     };
   },
   async onLoad(query) {
@@ -627,6 +628,10 @@ export default {
       this.serverpart = query.id;
     }
 
+    if (query.pageType) {
+      this.pageType = query.pageType;
+    }
+
     await this.handleGetServerpartDetail(this.serverpart);
     await this.handleGetMerchant();
     await this.handleGetChargingStation(this.detailInfo);
@@ -635,7 +640,7 @@ export default {
   },
   async onShow() {
     let currentService = uni.getStorageSync("currentService");
-    if (currentService.SERVERPART_ID !== this.serverpart) {
+    if (!this.serverpart) {
       this.serverpart = currentService.SERVERPART_ID;
       await this.handleGetServerpartDetail(this.serverpart);
       await this.handleGetMerchant();
@@ -651,6 +656,7 @@ export default {
   methods: {
     // 附近的景点
     async handleGetNearScenic() {
+      // 
       const req = {
         SearchParameter: {
           PROVINCE_CODES: '530000'
@@ -664,7 +670,6 @@ export default {
       );
       let res = data.Result_Data.List
       this.nearScenic = res
-      console.log('nearScenicnearScenicnearScenic', res);
     },
     // 查询现在的充电桩
     async handleGetChargingStation(obj) {
@@ -673,7 +678,6 @@ export default {
         url: "https://xny.yciccloud.com/interconnect/api/interconnection/open/getConnectList", //仅为示例，并非真实接口地址。
         method: "POST",
         success: (res) => {
-          console.log("查询现在的充电桩", res.data);
           let list = res.data;
           let result = [];
           if (list && list.length > 0) {
@@ -692,8 +696,6 @@ export default {
               }
             });
           }
-          console.log("result", result);
-          console.log("obj", obj);
           let sum = 0;
           let have = 0;
           let use = 0;
@@ -705,18 +707,15 @@ export default {
               }
             });
           }
-          console.log("sum", sum);
           if (sum > 0) {
             use = sum;
             if (obj.sumDetail.STATEGRIDCHARGE > 0) {
-              console.log("1");
               if (obj.sumDetail.STATEGRIDCHARGE < result.length) {
                 have = result.length;
               } else {
                 have = obj.sumDetail.STATEGRIDCHARGE;
               }
             } else {
-              console.log("2");
               have = result.length;
             }
           } else {
@@ -735,7 +734,6 @@ export default {
             have: have,
             use: use,
           };
-          console.log("_this.chargingObj", _this.chargingObj);
 
           _this.$forceUpdate();
         },
@@ -757,10 +755,8 @@ export default {
         name: obj.SERVERPART_NAME,
         // address: "", // 这个可能会影响地图的定位，所以可以选择不填
         success(data) {
-          console.log(data);
         },
         fail(err) {
-          console.log(err);
         },
       });
     },
@@ -828,7 +824,6 @@ export default {
         UREA_COUNT: 0, // 尿素
         VEHICLEWATERFILLING: 0, // 加水
       };
-      console.log("res.RegionInfo", obj.RegionInfo);
       if (obj.RegionInfo && obj.RegionInfo.length > 0) {
         obj.RegionInfo.forEach((item) => {
           sumObj.LIVESTOCKPACKING += item.LIVESTOCKPACKING;
@@ -879,7 +874,6 @@ export default {
       }
       obj.sumDetail = sumObj;
       this.detailInfo = obj;
-      console.log("this.detailInfo", this.detailInfo);
       uni.hideLoading();
     },
     // 跳转到选择服务区
@@ -891,9 +885,16 @@ export default {
       // uni.navigateBack({
       //   delta: 1,
       // });
-      uni.switchTab({
+
-        url: "/pages/index/index",
+      if (this.pageType === "driver") {
-      });
+        uni.navigateBack({
+          delta: 1,
+        });
+      } else {
+        uni.switchTab({
+          url: "/pages/index/index",
+        });
+      }
     },
     // 拿到精选商家数据
     async handleGetMerchant() {
@@ -918,12 +919,10 @@ export default {
 
       // let list = data.Data.List;
       let list = data.Result_Data.List
-      console.log("handleGetMerchant", list);
       this.merchantList = list;
       uni.hideLoading();
     },
     goShop(item) {
-      console.log("goShop", item);
       if (item.SCANCODE_ORDER === 1) {
         this.goBuy(item);
       } else {
@@ -934,7 +933,6 @@ export default {
     },
     // 去点餐的跳转
     goBuy(item) {
-      console.log("goBuy", item);
       if (this.user.MEMBERSHIP_MOBILEPHONE) {
         let id = item.SERVERPARTSHOP_IDS.split(",")[0];
         uni.navigateTo({

pages/serviceList/index.vue

@@ -3,50 +3,29 @@
     <view class="searchBox">
       <view class="search">
         <image class="searchIcon" src="/static/images/home/searchIcon.svg" />
-        <input
+        <input class="searchText" v-model="searchText" confirm-type="search" @confirm="handleGetServiceList"
-          class="searchText"
+          placeholder="请输入想去的服务区" placeholder-style="font-size: 14px;color: #A69E9F;" />
-          v-model="searchText"
-          confirm-type="search"
-          @confirm="handleGetServiceList"
-          placeholder="请输入想去的服务区"
-          placeholder-style="font-size: 14px;color: #A69E9F;"
-        />
       </view>
     </view>
     <view class="content">
       <view class="serviceList" v-if="serviceList && serviceList.length > 0">
-        <view
+        <view class="serviceItem" v-for="(item, index) in serviceList" :key="index"
-          class="serviceItem"
+          @click="handleGoServiceDetail(item)">
-          v-for="(item, index) in serviceList"
-          :key="index"
-          @click="handleGoServiceDetail(item)"
-        >
           <view class="itemTop">
             <view class="title">{{ item.SERVERPART_NAME || "-" }}</view>
             <view class="status">营业中</view>
           </view>
           <view class="itemBottom">
             <view class="bottmLeft">
-              <image
+              <image class="img" v-if="item.ImageLits && item.ImageLits.length > 0" :src="item.ImageLits[0]" />
-                class="img"
+              <image class="img" v-else src="/static/images/home/defaultIcon.png" />
-                v-if="item.ImageLits && item.ImageLits.length > 0"
-                :src="item.ImageLits[0]"
-              />
-              <image
-                class="img"
-                v-else
-                src="/static/images/home/defaultIcon.png"
-              />
             </view>
             <view class="bottmRight">
               <view class="rightTop">
                 <view class="toiletItem" v-if="item.sumDetail.HASPANTRY > 0">
                   <view class="itemBlock">
                     <view class="toiletItemLeft">
-                      <image
+                      <image class="toiletIcon" src="/static/images/home/manWC.svg" />
-                        class="toiletIcon"
-                        src="/static/images/home/manWC.svg"
-                      />
                       <text class="toiletText">男厕</text>
                     </view>
                   </view>
@@ -55,25 +34,16 @@
                 <view class="toiletItem" v-if="item.sumDetail.HASWIFI > 0">
                   <view class="itemBlock">
                     <view class="toiletItemLeft">
-                      <image
+                      <image class="toiletIcon" src="/static/images/home/woManWC.svg" />
-                        class="toiletIcon"
-                        src="/static/images/home/woManWC.svg"
-                      />
                       <text class="toiletText">女厕</text>
                     </view>
                   </view>
                 </view>
 
-                <view
+                <view class="toiletItem" v-if="item.sumDetail.HASSHOWERROOM > 0">
-                  class="toiletItem"
-                  v-if="item.sumDetail.HASSHOWERROOM > 0"
-                >
                   <view class="itemBlock">
                     <view class="toiletItemLeft">
-                      <image
+                      <image class="toiletIcon" src="/static/images/home/showerRoom.svg" />
-                        class="toiletIcon"
-                        src="/static/images/home/showerRoom.svg"
-                      />
                       <text class="toiletText">淋浴间</text>
                     </view>
                   </view>
@@ -82,25 +52,16 @@
                 <view class="toiletItem" v-if="item.sumDetail.HASWATERROOM > 0">
                   <view class="itemBlock">
                     <view class="toiletItemLeft">
-                      <image
+                      <image class="toiletIcon" src="/static/images/home/waterBoiler.svg" />
-                        class="toiletIcon"
-                        src="/static/images/home/waterBoiler.svg"
-                      />
                       <text class="toiletText">开水器</text>
                     </view>
                   </view>
                 </view>
 
-                <view
+                <view class="toiletItem" v-if="item.sumDetail.MICROWAVEOVEN > 0">
-                  class="toiletItem"
-                  v-if="item.sumDetail.MICROWAVEOVEN > 0"
-                >
                   <view class="itemBlock">
                     <view class="toiletItemLeft">
-                      <image
+                      <image class="toiletIcon" src="/static/images/home/microwave.svg" />
-                        class="toiletIcon"
-                        src="/static/images/home/microwave.svg"
-                      />
                       <text class="toiletText">微波炉</text>
                     </view>
                   </view>
@@ -109,10 +70,7 @@
                 <view class="toiletItem" v-if="item.sumDetail.WASHERCOUNT > 0">
                   <view class="itemBlock">
                     <view class="toiletItemLeft">
-                      <image
+                      <image class="toiletIcon" src="/static/images/home/washingMachine.svg" />
-                        class="toiletIcon"
-                        src="/static/images/home/washingMachine.svg"
-                      />
                       <text class="toiletText">洗衣机</text>
                     </view>
                   </view>
@@ -121,17 +79,11 @@
               <view class="rightBottom">
                 <div class="goOrder" v-if="pageType === 'food'">
                   <!-- @click.stop="goBuy(item)" -->
-                  <image
+                  <image class="orderIcon" src="/static/images/home/goOrderIcon.png" />
-                    class="orderIcon"
-                    src="/static/images/home/goOrderIcon.png"
-                  />
                   <span class="goOrderText">去点餐</span>
                 </div>
-                <image
+                <image class="navigation" src="/static/images/home/navigationIcon.svg"
-                  class="navigation"
+                  @click.stop="handleOpenMap(item)" />
-                  src="/static/images/home/navigationIcon.svg"
-                  @click.stop="handleOpenMap(item)"
-                />
               </view>
             </view>
           </view>
@@ -164,8 +116,8 @@ export default {
         query.type === "food"
           ? "点餐"
           : query.type === "driver"
-          ? "司机之家"
+            ? "司机之家"
-          : "", // 设置为你想要显示的标题
+            : "", // 设置为你想要显示的标题
     });
     this.pageType = query.type;
     this.handleGetServiceList();
@@ -496,11 +448,13 @@ export default {
                 border: 2rpx solid #ae8d3e;
                 display: flex;
                 align-items: center;
+
                 .orderIcon {
                   width: 32rpx;
                   height: 32rpx;
                   margin-right: 8rpx;
                 }
+
                 .goOrderText {
                   font-family: PingFangSC, PingFang SC;
                   font-weight: 400;

pages/shopMallPage/index/index.vue

@@ -536,7 +536,7 @@
       </div>
     </div>
 
-    <uni-popup ref="priceRangeRef">
+    <uni-popup ref="priceRangeRef" @maskClick="handleMaskClick">
       <view class="priceRangeBox">
         <view class="titleBox">
           <view class="closeIcon"></view>
@@ -546,11 +546,11 @@
 
         <view class="inputBox">
           <view class="inputItem">
-            <input placeholder="最低价" v-model="minPrice" />
+            <input placeholder="最低价" v-model="minPrice" type="number" />
           </view>
           <span class="unit">-</span>
           <view class="inputItem">
-            <input placeholder="最高价" v-model="maxPrice" />
+            <input placeholder="最高价" v-model="maxPrice" type="number" />
           </view>
         </view>
 
@@ -587,7 +587,7 @@
     </uni-popup>
 
     <!-- 回到顶部 -->
-    <view class="backTopBox" v-if="showBackTop" @click="handleGoBack">
+    <view class="backTopBox" v-if="showBackTop && priceRangeRefShow === false" @click="handleGoBack">
       <image class="backIcon" src="/static/images/home/backTopIcon.png" />
     </view>
 
@@ -622,8 +622,8 @@ export default {
         { label: "德和", value: 9, src: "/static/images/home/9.png" },
         { label: "蔬果园", value: 10, src: "/static/images/home/10.png" },
       ], // 热门品牌类型
-      minPrice: "", // 最低价
+      minPrice: 10, // 最低价
-      maxPrice: "", // 最高价
+      maxPrice: 100, // 最高价
       allShopList: [], // 工会之家时拿到的全部商品
       showShopList: [], // 当前显示的全部商品
       pageIndex: 1, // 当前显示几个 10个商品
@@ -652,6 +652,7 @@ export default {
       haveActivity: false, // 是否有活动
       activityObj: {}, // 活动项的具体内容
       activityShopList: [], // 活动商品列表
+      priceRangeRefShow: false
     };
   },
   async onLoad(query) {
@@ -825,6 +826,9 @@ export default {
     };
   },
   methods: {
+    handleMaskClick(e) {
+      this.priceRangeRefShow = false
+    },
     handleGoPointsMall() {
       uni.navigateTo({
         url: `/pages/shopPages/shopList/index?pageType=pointsMall`,
@@ -853,6 +857,7 @@ export default {
     // 关闭价格区间的悬浮框
     handleClosePricePopup() {
       this.$refs.priceRangeRef.close();
+      this.priceRangeRefShow = false
     },
     // 榜单的方法
     async handleGetSortList() {
@@ -1042,6 +1047,7 @@ export default {
       // 拿到工会之家的商品列表
       await this.handleGetUnionShopList();
       this.$refs.priceRangeRef.close();
+      this.priceRangeRefShow = false
     },
     // 价格筛选的确认
     async handleConfirm() {
@@ -1063,10 +1069,12 @@ export default {
       // 拿到工会之家的商品列表
       await this.handleGetUnionShopList();
       this.$refs.priceRangeRef.close();
+      this.priceRangeRefShow = false
     },
     // 显示价格的悬浮框
     handleShowPricePopup() {
       this.$refs.priceRangeRef.open("bottom");
+      this.priceRangeRefShow = true
     },
     // 品牌的跳转
     handleSearchBrand(value) {

pages/shopMallPage/shopType/index.vue

@@ -106,7 +106,7 @@
                 top: (startIndex + i) * itemHeight + 'px',
                 width: '100%'
               }" @click="showDetail(item)">
-                <image class="leftImg" style="width: 80px; height: 80px"
+                <image class="leftImg" style="width: 90px; height: 90px"
                   :src="item.IMAGE_PATH || '/static/images/home/defultImg.png'" :lazy-load="true"
                   @error="e => e.target.src = '/static/images/home/defultImg.png'" :key="item.COMMODITY_ID" />
                 <div class="rightBox">
@@ -118,6 +118,10 @@
                         {{ item.bigNumber || "" }}</span>
                       <span class="number" style="font-size: 14px">.{{ item.smallNumber || "00" }}</span>
                       <span class="unit">/ {{ item.COMMODITY_UNIT }}</span>
+
+                      <!-- <span class="marketPrice">市场价：</span> -->
+                      <!-- <span class="marketPriceValue">XXX</span> -->
+                      <!-- <span class="unit">/ {{ item.COMMODITY_UNIT }}</span> -->
                     </div>
                     <div v-if="item.SKULIST && item.SKULIST.length > 0" class="specifications"
                       @click.stop="handleShowPopup(item)">
@@ -142,6 +146,10 @@
                       <div v-else class="shopState">已售罄</div>
                     </div>
                   </div>
+
+                  <div class="marketBottom" v-if="item.COMMODITY_RETAILPRICE">
+                    <span class="marketPrice">市场价：¥{{ item.COMMODITY_RETAILPRICE }}/ {{ item.COMMODITY_UNIT }}</span>
+                  </div>
                 </div>
               </div>
             </div>
@@ -275,7 +283,7 @@ export default {
       safeHeight: 0,
 
 
-      itemHeight: 104, // 单个商品高度(px)
+      itemHeight: 114, // 单个商品高度(px)
       virtualListHeight: 520, // 可视区高度(px)，比如显示5个
       startIndex: 0,
       endIndex: 0,
@@ -1693,9 +1701,9 @@ export default {
           border-bottom: 1px solid #f5f7f7;
 
           .leftImg {
-            width: 80px;
+            width: 180rpx;
-            height: 80px;
+            height: 180rpx;
-            border-radius: 8px;
+            border-radius: 16rpx;
           }
 
           .rightBox {
@@ -1757,6 +1765,25 @@ export default {
                   font-weight: 400;
                   color: #9fa3a8;
                 }
+
+                .marketPrice {
+                  font-size: 12px;
+                  line-height: 12px;
+                  font-family: PingFangSC-Regular, PingFang SC;
+                  font-weight: 400;
+                  color: #9fa3a8;
+                  text-decoration: line-through;
+                }
+
+                .marketPriceValue {
+                  font-size: 12px;
+                  line-height: 12px;
+                  font-family: PingFangSC-Regular, PingFang SC;
+                  font-weight: 400;
+                  color: #9fa3a8;
+                  text-decoration: line-through;
+                }
+
               }
 
               .addReduceBox {
@@ -1870,6 +1897,36 @@ export default {
                 }
               }
             }
+
+            .marketBottom {
+              height: 12px;
+
+              .marketPrice {
+                font-size: 10px;
+                line-height: 12px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #9fa3a8;
+                text-decoration: line-through;
+              }
+
+              .marketPriceValue {
+                font-size: 10px;
+                line-height: 12px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #9fa3a8;
+                text-decoration: line-through;
+              }
+
+              .unit {
+                font-size: 10px;
+                line-height: 12px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #9fa3a8;
+              }
+            }
           }
         }
       }

pages/shopPages/shopDetail/index.vue

@@ -74,11 +74,11 @@
       <div class="product-info">
         <div style="
           display: flex;
-          align-items: center;
-          justify-content: space-between;
           box-sizing: border-box;
           padding: 16rpx 0 16rpx 32rpx;
         ">
+          <!-- align-items: center;
+          justify-content: space-between; -->
           <div class="price-box">
             <div class="vip-price">
               <span class="unit">¥</span>
@@ -88,13 +88,20 @@
               </span>
             </div>
 
-            <div class="originalPrice" v-if="pageType === 'UnionMall'">
+            <!-- <div class="originalPrice" v-if="pageType === 'UnionMall'">
               <span class="unit">¥</span>
               <span class="oldPrice">
                 {{ good.RETbigNumber || "" }}.{{ good.RETsmallNumber || "00" }}
               </span>
-            </div>
+            </div> -->
           </div>
+
+          <div class="marketBottom" v-if="good.COMMODITY_RETAILPRICE">
+            <span class="marketPrice">市场价：¥{{ good.COMMODITY_RETAILPRICE }}</span>
+          </div>
+
+
+
           <div>
             <!-- <span class="sale-count">
             {{
@@ -1772,6 +1779,33 @@ hr {
   position: relative;
 }
 
+.marketBottom {
+  margin-left: 12px;
+
+  .marketPrice {
+    font-size: 12px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #9fa3a8;
+    text-decoration: line-through;
+  }
+
+  .marketPriceValue {
+    font-size: 12px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #9fa3a8;
+    text-decoration: line-through;
+  }
+
+  .unit {
+    font-size: 12px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #9fa3a8;
+  }
+}
+
 .sale-count {
   font-size: 24rpx;
   color: #333;

pages/shopPages/shopList/index.vue

@@ -74,7 +74,7 @@ export default {
   components: {
     NoData,
   },
-  onLoad(query) {
+  async onLoad(query) {
     console.log("query", query);
     if (query.pageType === "UnionMall") {
       this.selectType = query.type;
@@ -106,12 +106,14 @@ export default {
     this.queryType = query.pageType;
     this.pageType = query.pageType === "brand" ? "UnionMall" : query.pageType;
     this.menu = uni.getMenuButtonBoundingClientRect();
-    this.handleGetShopList(query.type);
+    await this.handleGetShopList(query.type);
     this.$utils.addUserBehaviorNew();
   },
   methods: {
     // 找到对应类型的商品列表
     async handleGetShopList(type) {
+      console.log('this.shopMsgthis.shopMsgthis.shopMsg', this.shopMsg);
+
       // 如果已经到底了 就调用
       if (this.shopMsg.isOver) {
         return;
@@ -120,6 +122,7 @@ export default {
       uni.showLoading({
         title: "加载中...",
       });
+
       let req = {};
       if (this.queryType === "UnionMall") {
         req = {

unpackage/dist/dev/mp-weixin/pages/highwayHeadlines/index.wxml

@@ -1 +1 @@
-<view class="main _div data-v-765f0f4e"><view class="tabBox _div data-v-765f0f4e"><block wx:for="{{tabList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleChangeTab',['$0'],[[['tabList','',index,'value']]]]]]]}}" class="{{['_div','data-v-765f0f4e',selectTab===item.value?'tabItem selectTabItem':'tabItem']}}" bindtap="__e">{{''+item.label+''}}</view></block></view><scroll-view class="contentList data-v-765f0f4e" scroll-y="{{true}}"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleGoDetail',['$0'],[[['allMessageList.'+selectTab+'','',index]]]]]]]}}" class="contentItem _div data-v-765f0f4e" bindtap="__e"><view class="left _div data-v-765f0f4e"><view class="title _div data-v-765f0f4e">{{item.$orig.title||item.$orig.NOTICEINFO_TITLE||""}}</view><view class="content _div data-v-765f0f4e">{{item.$orig.NOTICEINFO_CONTENT||""}}</view><view class="descBox _div data-v-765f0f4e"><label class="name _span data-v-765f0f4e">{{item.$orig.author||item.$orig.STAFF_NAME||"-"}}</label><label class="time _span data-v-765f0f4e">{{item.$orig.publishTime||item.$orig.START_DATE||"-"}}</label></view></view><view class="right _div data-v-765f0f4e"><block wx:if="{{item.g0}}"><image class="leftIcon data-v-765f0f4e" src="{{item.$orig.ImageList[0].ImageUrl}}"></image></block><block wx:else><image class="leftIcon data-v-765f0f4e" src="{{item.$orig.coverImg?item.$orig.coverImg:'https://eshangtech.com/ShopICO/no-picture.png'}}"></image></block></view></view></block><block wx:if="{{!$root.g1}}"><view class="_div data-v-765f0f4e"><no-data vue-id="55835b78-1" text="暂无内容" class="data-v-765f0f4e" bind:__l="__l"></no-data></view></block></scroll-view></view>
+<view class="main _div data-v-765f0f4e"><view class="tabBox _div data-v-765f0f4e"><block wx:for="{{tabList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleChangeTab',['$0'],[[['tabList','',index,'value']]]]]]]}}" class="{{['_div','data-v-765f0f4e',selectTab===item.value?'tabItem selectTabItem':'tabItem']}}" bindtap="__e">{{''+item.label+''}}</view></block></view><scroll-view class="contentList data-v-765f0f4e" scroll-y="{{true}}"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleGoDetail',['$0'],[[['allMessageList.'+selectTab+'','',index]]]]]]]}}" class="contentItem _div data-v-765f0f4e" bindtap="__e"><view class="left _div data-v-765f0f4e"><view class="title _div data-v-765f0f4e">{{item.$orig.title||item.$orig.NOTICEINFO_TITLE||""}}</view><view class="content _div data-v-765f0f4e">{{item.$orig.NOTICEINFO_CONTENT||""}}</view><view class="descBox _div data-v-765f0f4e"><label class="name _span data-v-765f0f4e">{{item.$orig.author||item.$orig.STAFF_NAME||"-"}}</label><label class="time _span data-v-765f0f4e">{{item.$orig.publishTime||item.$orig.START_DATE||"-"}}</label></view></view><view class="right _div data-v-765f0f4e"><block wx:if="{{item.g0}}"><image class="leftIcon data-v-765f0f4e" src="{{item.$orig.ImageList[0].ImageUrl}}" lazy-load="{{true}}"></image></block><block wx:else><image class="leftIcon data-v-765f0f4e" lazy-load="{{true}}" src="{{item.$orig.coverImg?item.$orig.coverImg:'https://eshangtech.com/ShopICO/no-picture.png'}}"></image></block></view></view></block><block wx:if="{{!$root.g1}}"><view class="_div data-v-765f0f4e"><no-data vue-id="55835b78-1" text="暂无内容" class="data-v-765f0f4e" bind:__l="__l"></no-data></view></block></scroll-view></view>

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

@@ -271,7 +271,9 @@ var _default = {
         use: 0
       },
       // 充电桩数据
-      nearScenic: [] // 景点列表
+      nearScenic: [],
+      // 景点列表
+      pageType: ""
     };
   },
   onLoad: function onLoad(query) {
@@ -286,20 +288,23 @@ var _default = {
               if (query.id) {
                 _this2.serverpart = query.id;
               }
-              _context.next = 5;
+              if (query.pageType) {
+                _this2.pageType = query.pageType;
+              }
+              _context.next = 6;
               return _this2.handleGetServerpartDetail(_this2.serverpart);
-            case 5:
+            case 6:
-              _context.next = 7;
+              _context.next = 8;
               return _this2.handleGetMerchant();
-            case 7:
+            case 8:
-              _context.next = 9;
+              _context.next = 10;
               return _this2.handleGetChargingStation(_this2.detailInfo);
-            case 9:
+            case 10:
-              _context.next = 11;
+              _context.next = 12;
               return _this2.handleGetNearScenic();
-            case 11:
-              _this2.$utils.addUserBehaviorNew();
             case 12:
+              _this2.$utils.addUserBehaviorNew();
+            case 13:
             case "end":
               return _context.stop();
           }
@@ -316,7 +321,7 @@ var _default = {
           switch (_context2.prev = _context2.next) {
             case 0:
               currentService = uni.getStorageSync("currentService");
-              if (!(currentService.SERVERPART_ID !== _this3.serverpart)) {
+              if (_this3.serverpart) {
                 _context2.next = 11;
                 break;
               }
@@ -353,6 +358,7 @@ var _default = {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
+                // 
                 req = {
                   SearchParameter: {
                     PROVINCE_CODES: '530000'
@@ -366,8 +372,7 @@ var _default = {
                 data = _context3.sent;
                 res = data.Result_Data.List;
                 _this4.nearScenic = res;
-                console.log('nearScenicnearScenicnearScenic', res);
+              case 6:
-              case 7:
               case "end":
                 return _context3.stop();
             }
@@ -390,7 +395,6 @@ var _default = {
                   //仅为示例，并非真实接口地址。
                   method: "POST",
                   success: function success(res) {
-                    console.log("查询现在的充电桩", res.data);
                     var list = res.data;
                     var result = [];
                     if (list && list.length > 0) {
@@ -400,8 +404,6 @@ var _default = {
                         }
                       });
                     }
-                    console.log("result", result);
-                    console.log("obj", obj);
                     var sum = 0;
                     var have = 0;
                     var use = 0;
@@ -412,18 +414,15 @@ var _default = {
                         }
                       });
                     }
-                    console.log("sum", sum);
                     if (sum > 0) {
                       use = sum;
                       if (obj.sumDetail.STATEGRIDCHARGE > 0) {
-                        console.log("1");
                         if (obj.sumDetail.STATEGRIDCHARGE < result.length) {
                           have = result.length;
                         } else {
                           have = obj.sumDetail.STATEGRIDCHARGE;
                         }
                       } else {
-                        console.log("2");
                         have = result.length;
                       }
                     } else {
@@ -441,7 +440,6 @@ var _default = {
                       have: have,
                       use: use
                     };
-                    console.log("_this.chargingObj", _this.chargingObj);
                     _this.$forceUpdate();
                   }
                 });
@@ -469,12 +467,8 @@ var _default = {
         // 缩放比例
         name: obj.SERVERPART_NAME,
         // address: "", // 这个可能会影响地图的定位，所以可以选择不填
-        success: function success(data) {
+        success: function success(data) {},
-          console.log(data);
+        fail: function fail(err) {}
-        },
-        fail: function fail(err) {
-          console.log(err);
-        }
       });
     },
     // 查询服务区详情
@@ -581,7 +575,6 @@ var _default = {
                   VEHICLEWATERFILLING: 0 // 加水
                 };
 
-                console.log("res.RegionInfo", obj.RegionInfo);
                 if (obj.RegionInfo && obj.RegionInfo.length > 0) {
                   obj.RegionInfo.forEach(function (item) {
                     sumObj.LIVESTOCKPACKING += item.LIVESTOCKPACKING;
@@ -632,9 +625,8 @@ var _default = {
                 }
                 obj.sumDetail = sumObj;
                 _this6.detailInfo = obj;
-                console.log("this.detailInfo", _this6.detailInfo);
                 uni.hideLoading();
-              case 16:
+              case 14:
               case "end":
                 return _context5.stop();
             }
@@ -653,9 +645,16 @@ var _default = {
       // uni.navigateBack({
       //   delta: 1,
       // });
-      uni.switchTab({
+
-        url: "/pages/index/index"
+      if (this.pageType === "driver") {
-      });
+        uni.navigateBack({
+          delta: 1
+        });
+      } else {
+        uni.switchTab({
+          url: "/pages/index/index"
+        });
+      }
     },
     // 拿到精选商家数据
     handleGetMerchant: function handleGetMerchant() {
@@ -688,10 +687,9 @@ var _default = {
                 data = _context6.sent;
                 // let list = data.Data.List;
                 list = data.Result_Data.List;
-                console.log("handleGetMerchant", list);
                 _this7.merchantList = list;
                 uni.hideLoading();
-              case 8:
+              case 7:
               case "end":
                 return _context6.stop();
             }
@@ -700,7 +698,6 @@ var _default = {
       }))();
     },
     goShop: function goShop(item) {
-      console.log("goShop", item);
       if (item.SCANCODE_ORDER === 1) {
         this.goBuy(item);
       } else {
@@ -711,7 +708,6 @@ var _default = {
     },
     // 去点餐的跳转
     goBuy: function goBuy(item) {
-      console.log("goBuy", item);
       if (this.user.MEMBERSHIP_MOBILEPHONE) {
         var id = item.SERVERPARTSHOP_IDS.split(",")[0];
         uni.navigateTo({

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

@@ -290,9 +290,9 @@ var _default = {
         src: "/static/images/home/10.png"
       }],
       // 热门品牌类型
-      minPrice: "",
+      minPrice: 10,
       // 最低价
-      maxPrice: "",
+      maxPrice: 100,
       // 最高价
       allShopList: [],
       // 工会之家时拿到的全部商品
@@ -330,7 +330,9 @@ var _default = {
       // 是否有活动
       activityObj: {},
       // 活动项的具体内容
-      activityShopList: [] // 活动商品列表
+      activityShopList: [],
+      // 活动商品列表
+      priceRangeRefShow: false
     };
   },
   onLoad: function onLoad(query) {
@@ -506,6 +508,9 @@ var _default = {
     };
   },
   methods: {
+    handleMaskClick: function handleMaskClick(e) {
+      this.priceRangeRefShow = false;
+    },
     handleGoPointsMall: function handleGoPointsMall() {
       uni.navigateTo({
         url: "/pages/shopPages/shopList/index?pageType=pointsMall"
@@ -534,6 +539,7 @@ var _default = {
     // 关闭价格区间的悬浮框
     handleClosePricePopup: function handleClosePricePopup() {
       this.$refs.priceRangeRef.close();
+      this.priceRangeRefShow = false;
     },
     // 榜单的方法
     handleGetSortList: function handleGetSortList() {
@@ -750,7 +756,8 @@ var _default = {
                 return _this5.handleGetUnionShopList();
               case 7:
                 _this5.$refs.priceRangeRef.close();
-              case 8:
+                _this5.priceRangeRefShow = false;
+              case 9:
               case "end":
                 return _context4.stop();
             }
@@ -786,7 +793,8 @@ var _default = {
                 return _this6.handleGetUnionShopList();
               case 7:
                 _this6.$refs.priceRangeRef.close();
-              case 8:
+                _this6.priceRangeRefShow = false;
+              case 9:
               case "end":
                 return _context5.stop();
             }
@@ -797,6 +805,7 @@ var _default = {
     // 显示价格的悬浮框
     handleShowPricePopup: function handleShowPricePopup() {
       this.$refs.priceRangeRef.open("bottom");
+      this.priceRangeRefShow = true;
     },
     // 品牌的跳转
     handleSearchBrand: function handleSearchBrand(value) {

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

@@ -250,7 +250,7 @@ var _default = {
       // 悬浮框里面 选择规格的商品详情
       systemInfo: {},
       safeHeight: 0,
-      itemHeight: 104,
+      itemHeight: 114,
       // 单个商品高度(px)
       virtualListHeight: 520,
       // 可视区高度(px)，比如显示5个

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

@@ -297,9 +297,9 @@
   border-bottom: 1px solid #f5f7f7;
 }
 .main .pageContent .shopListBox .shopDetailList .shopDetailItem .leftImg.data-v-36e5d840 {
-  width: 80px;
+  width: 180rpx;
-  height: 80px;
+  height: 180rpx;
-  border-radius: 8px;
+  border-radius: 16rpx;
 }
 .main .pageContent .shopListBox .shopDetailList .shopDetailItem .rightBox.data-v-36e5d840 {
   margin-left: 12px;
@@ -356,6 +356,22 @@
   font-weight: 400;
   color: #9fa3a8;
 }
+.main .pageContent .shopListBox .shopDetailList .shopDetailItem .rightBox .bottom .detailPrice .marketPrice.data-v-36e5d840 {
+  font-size: 12px;
+  line-height: 12px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #9fa3a8;
+  text-decoration: line-through;
+}
+.main .pageContent .shopListBox .shopDetailList .shopDetailItem .rightBox .bottom .detailPrice .marketPriceValue.data-v-36e5d840 {
+  font-size: 12px;
+  line-height: 12px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #9fa3a8;
+  text-decoration: line-through;
+}
 .main .pageContent .shopListBox .shopDetailList .shopDetailItem .rightBox .bottom .addReduceBox.data-v-36e5d840 {
   width: 80px;
   display: flex;
@@ -455,6 +471,32 @@
   font-size: 24rpx;
   flex: 1;
 }
+.main .pageContent .shopListBox .shopDetailList .shopDetailItem .rightBox .marketBottom.data-v-36e5d840 {
+  height: 12px;
+}
+.main .pageContent .shopListBox .shopDetailList .shopDetailItem .rightBox .marketBottom .marketPrice.data-v-36e5d840 {
+  font-size: 10px;
+  line-height: 12px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #9fa3a8;
+  text-decoration: line-through;
+}
+.main .pageContent .shopListBox .shopDetailList .shopDetailItem .rightBox .marketBottom .marketPriceValue.data-v-36e5d840 {
+  font-size: 10px;
+  line-height: 12px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #9fa3a8;
+  text-decoration: line-through;
+}
+.main .pageContent .shopListBox .shopDetailList .shopDetailItem .rightBox .marketBottom .unit.data-v-36e5d840 {
+  font-size: 10px;
+  line-height: 12px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #9fa3a8;
+}
 .main .shopPopupBox.data-v-36e5d840 {
   width: 100%;
   height: 80vh;

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

@@ -159,6 +159,29 @@
   align-items: flex-end;
   position: relative;
 }
+.marketBottom.data-v-0dc4ca38 {
+  margin-left: 12px;
+}
+.marketBottom .marketPrice.data-v-0dc4ca38 {
+  font-size: 12px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #9fa3a8;
+  text-decoration: line-through;
+}
+.marketBottom .marketPriceValue.data-v-0dc4ca38 {
+  font-size: 12px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #9fa3a8;
+  text-decoration: line-through;
+}
+.marketBottom .unit.data-v-0dc4ca38 {
+  font-size: 12px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #9fa3a8;
+}
 .sale-count.data-v-0dc4ca38 {
   font-size: 24rpx;
   color: #333;

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

@@ -182,91 +182,109 @@ var _default = {
     NoData: NoData
   },
   onLoad: function onLoad(query) {
-    console.log("query", query);
+    var _this = this;
-    if (query.pageType === "UnionMall") {
+    return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      this.selectType = query.type;
+      return _regenerator.default.wrap(function _callee$(_context) {
-      if (query.type === "1") {
+        while (1) {
-        this.pageTitle = "新品榜";
+          switch (_context.prev = _context.next) {
-      } else if (query.type === "2") {
+            case 0:
-        this.pageTitle = "热销榜";
+              console.log("query", query);
-      } else if (query.type === "3") {
+              if (query.pageType === "UnionMall") {
-        this.pageTitle = "推荐榜";
+                _this.selectType = query.type;
-      }
+                if (query.type === "1") {
-    } else if (query.pageType === "brand") {
+                  _this.pageTitle = "新品榜";
-      this.selectType = query.type;
+                } else if (query.type === "2") {
-      this.brandName = query.name;
+                  _this.pageTitle = "热销榜";
-      this.pageTitle = "品牌列表";
+                } else if (query.type === "3") {
-    } else if (query.pageType === "pointsMall") {
+                  _this.pageTitle = "推荐榜";
-      this.pageTitle = "积分商城";
+                }
-    } else {
+              } else if (query.pageType === "brand") {
-      this.selectType = query.type;
+                _this.selectType = query.type;
-      if (query.type === "5030") {
+                _this.brandName = query.name;
-        this.pageTitle = "促销单品";
+                _this.pageTitle = "品牌列表";
-      } else if (query.type === "5040") {
+              } else if (query.pageType === "pointsMall") {
-        this.pageTitle = "甄选商品";
+                _this.pageTitle = "积分商城";
-      } else if (query.type === "5050") {
+              } else {
-        this.pageTitle = "今日推荐";
+                _this.selectType = query.type;
-      } else if (query.type === "4597") {
+                if (query.type === "5030") {
-        this.pageTitle = "每周特惠";
+                  _this.pageTitle = "促销单品";
-      }
+                } else if (query.type === "5040") {
-    }
+                  _this.pageTitle = "甄选商品";
-    this.queryType = query.pageType;
+                } else if (query.type === "5050") {
-    this.pageType = query.pageType === "brand" ? "UnionMall" : query.pageType;
+                  _this.pageTitle = "今日推荐";
-    this.menu = uni.getMenuButtonBoundingClientRect();
+                } else if (query.type === "4597") {
-    this.handleGetShopList(query.type);
+                  _this.pageTitle = "每周特惠";
-    this.$utils.addUserBehaviorNew();
+                }
+              }
+              _this.queryType = query.pageType;
+              _this.pageType = query.pageType === "brand" ? "UnionMall" : query.pageType;
+              _this.menu = uni.getMenuButtonBoundingClientRect();
+              _context.next = 7;
+              return _this.handleGetShopList(query.type);
+            case 7:
+              _this.$utils.addUserBehaviorNew();
+            case 8:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
   },
   methods: {
     // 找到对应类型的商品列表
     handleGetShopList: function handleGetShopList(type) {
-      var _this = this;
+      var _this2 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var req, data, oldList, shopList, list;
-        return _regenerator.default.wrap(function _callee$(_context) {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context.prev = _context.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
-                if (!_this.shopMsg.isOver) {
+                console.log('this.shopMsgthis.shopMsgthis.shopMsg', _this2.shopMsg);
-                  _context.next = 2;
+
+                // 如果已经到底了 就调用
+                if (!_this2.shopMsg.isOver) {
+                  _context2.next = 3;
                   break;
                 }
-                return _context.abrupt("return");
+                return _context2.abrupt("return");
-              case 2:
+              case 3:
                 uni.showLoading({
                   title: "加载中..."
                 });
                 req = {};
-                if (_this.queryType === "UnionMall") {
+                if (_this2.queryType === "UnionMall") {
                   req = {
                     action_type: "WeChat_GetMallGoodsInfo",
                     ownerUnitId: 911,
                     COMMODITYNATURE: 5070,
                     payMethod: "1000,3000",
                     justCommodity: 1,
-                    userdefinedtypeId: _this.selectType === "1" ? "1317" : _this.selectType === "2" ? "1318" : _this.selectType === "3" ? "1319" : "",
+                    userdefinedtypeId: _this2.selectType === "1" ? "1317" : _this2.selectType === "2" ? "1318" : _this2.selectType === "3" ? "1319" : "",
-                    sortStr: _this.selectType === "2" ? "COMMODITY_EN desc" : "",
+                    sortStr: _this2.selectType === "2" ? "COMMODITY_EN desc" : "",
-                    Page_Size: _this.shopMsg.pageSize,
+                    Page_Size: _this2.shopMsg.pageSize,
-                    Page_Index: _this.shopMsg.pageIndex
+                    Page_Index: _this2.shopMsg.pageIndex
                   };
-                } else if (_this.queryType === "brand") {
+                } else if (_this2.queryType === "brand") {
                   req = {
                     action_type: "WeChat_GetMallGoodsInfo",
                     ownerUnitId: 911,
                     COMMODITYNATURE: 5070,
                     payMethod: "1000,3000",
                     justCommodity: 1,
-                    brandName: _this.brandName,
+                    brandName: _this2.brandName,
-                    Page_Size: _this.shopMsg.pageSize,
+                    Page_Size: _this2.shopMsg.pageSize,
-                    Page_Index: _this.shopMsg.pageIndex
+                    Page_Index: _this2.shopMsg.pageIndex
                   };
-                } else if (_this.queryType === "pointsMall") {
+                } else if (_this2.queryType === "pointsMall") {
                   req = {
                     action_type: "WeChat_GetMallGoodsInfo",
                     ownerUnitId: 911,
                     justCommodity: 1,
                     payMethod: "2000,3000",
-                    Page_Size: _this.shopMsg.pageSize,
+                    Page_Size: _this2.shopMsg.pageSize,
-                    Page_Index: _this.shopMsg.pageIndex
+                    Page_Index: _this2.shopMsg.pageIndex
                   };
                 } else {
                   req = {
@@ -276,23 +294,23 @@ var _default = {
                     userdefinedtypeId: type === '4597' ? '4597' : "",
                     justCommodity: type === '4597' ? '' : 1,
                     payMethod: type === '4597' ? '' : "1000,3000",
-                    Page_Size: _this.shopMsg.pageSize,
+                    Page_Size: _this2.shopMsg.pageSize,
-                    Page_Index: _this.shopMsg.pageIndex
+                    Page_Index: _this2.shopMsg.pageIndex
                   };
                 }
-                _context.next = 7;
+                _context2.next = 8;
-                return _this.$api.getCoop(req);
+                return _this2.$api.getCoop(req);
-              case 7:
+              case 8:
-                data = _context.sent;
+                data = _context2.sent;
                 oldList = [];
-                if (_this.shopList && _this.shopList.length > 0) {
+                if (_this2.shopList && _this2.shopList.length > 0) {
-                  oldList = _this.shopList;
+                  oldList = _this2.shopList;
                 }
                 shopList = [];
                 list = data.Data.List;
                 if (list && list.length > 0) {
                   if (list.length < 10) {
-                    _this.shopMsg.isOver = true;
+                    _this2.shopMsg.isOver = true;
                   }
                   list.forEach(function (item) {
                     if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
@@ -315,14 +333,14 @@ var _default = {
                   });
                 }
                 console.log("shopList", shopList);
-                _this.shopList = oldList.concat(shopList);
+                _this2.shopList = oldList.concat(shopList);
                 uni.hideLoading();
-              case 16:
+              case 17:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee);
+        }, _callee2);
       }))();
     },
     // 跳转商品详情