update

components/shopTabbar.vue

@@ -27,7 +27,9 @@
         }">分类</span>
       </div>
       <div class="tabItem" @click="goPages('/pages/shopMallPage/shopCar/index')">
-        <span class="shopCarNumber" v-if="shopCount > 0">{{ shopCount }}</span>
+        <span class="shopCarNumber" v-if="shopCount > 0"
+          :style="{ background: pageType === 'UnionMall' ? '#E43C3D' : '#4BCB7E' }">{{ shopCount
+          }}</span>
 
         <image class="tabItemIcon" :src="selectIndex === '/pages/shopMallPage/shopCar/index'
           ? '/static/images/shopTabbar/active_shopCar.png'
@@ -145,6 +147,12 @@ export default {
           }
 
         }
+      } else if (pageIndex === "/pages/shopMallPage/user/newIndex") {
+        // 判断是不是在购物车里面  2 表示工会商城  1 表示精选商城
+        uni.setStorageSync("inShop", this.pageType ? 2 : 1)
+        uni.navigateTo({
+          url: "/pages/shopMallPage/user/newIndex",
+        })
       } else {
         if (this.selectIndex === '/pages/shopMallPage/index/index') {
           uni.navigateTo({

pages/allFunPage/index.vue

@@ -93,7 +93,7 @@ export default {
           url: `/pages/otherFunPage/goPublicPage/index`,
         });
         // uni.navigateTo({
-        //   url: `/pages/noDataPage/index`,
+        //   url: `/pages/noDataPage/index`, 
         // });
       } else if (obj.value === 3) {
         // 充电
@@ -180,6 +180,17 @@ export default {
       } else if (obj.value === 15) {
         // 商城
         this.handleGoShop();
+      } else if (obj.value === 17) {
+        if (obj.index === 0) {
+          uni.navigateTo({
+            url: `/pages/shopMallPage/shopType/index?comeForm=index`,
+          });
+        } else {
+          uni.navigateTo({
+            url: `/pages/highwayHeadlines/attractInvestment`,
+          });
+        }
+
       }
     },
     // 改变状态 是否可以修改位置

pages/index/index.vue

@@ -5,7 +5,7 @@
         ? `url(https://eshangtech.com/minTestImg/springPageBg.png)`
         : `url(https://eshangtech.com/minTestImg/pageBg.png)`,
   }">
-    <view class="topBox" :style="{
+    <view class="topBox" :style="{ 
       height: menu.bottom + 14 + 'px',
       backgroundImage:
         pageType === 'spring'
@@ -272,8 +272,9 @@
               <scroll-view scroll-x class="advertisementItemBottom">
                 <view class="scroll-content">
                   <image class="advertisementImg" v-for="(item, index) in everyWeekShopData" :key="index"
-                    :src="item.IMAGE_PATH || '/static/images/home/defultImg.png'"
+                    :src="item.IMAGE_PATH ? item.IMAGE_PATH.split(',') && item.IMAGE_PATH.split(',').length > 1 ? item.IMAGE_PATH.split(',')[0] : item.IMAGE_PATH : '/static/images/home/defultImg.png'"
                     @click.stop="handleGoShopDetail(item)" />
+
                   <!-- <image class="advertisementImg" /> -->
                 </view>
               </scroll-view>
@@ -294,7 +295,8 @@
               </view>
               <view class="advertisementItemBottom">
                 <image class="advertisementImg" v-for="(item, index) in specialOffersList" :key="index"
-                  :src="item.IMAGE_PATH" @click.stop="handleGoShopDetail(item)" />
+                  :src="item.IMAGE_PATH ? item.IMAGE_PATH.split(',') && item.IMAGE_PATH.split(',').length > 1 ? item.IMAGE_PATH.split(',')[0] : item.IMAGE_PATH : '/static/images/home/defultImg.png'"
+                  @click.stop="handleGoShopDetail(item)" />
                 <!-- <image class="advertisementImg" /> -->
               </view>
             </view>
@@ -312,7 +314,8 @@
               </view>
               <view class="advertisementItemBottom">
                 <image class="advertisementImg" v-for="(item, index) in productsList" :key="index"
-                  :src="item.IMAGE_PATH" @click.stop="handleGoShopDetail(item)" />
+                  :src="item.IMAGE_PATH ? item.IMAGE_PATH.split(',') && item.IMAGE_PATH.split(',').length > 1 ? item.IMAGE_PATH.split(',')[0] : item.IMAGE_PATH : '/static/images/home/defultImg.png'"
+                  @click.stop="handleGoShopDetail(item)" />
                 <!-- <image class="advertisementImg" /> -->
               </view>
             </view>
@@ -643,8 +646,12 @@ export default {
     this.handleGetProductsList();
     // 商城的内容
     this.handleGetShoppingMall();
-    // 景区信息
+
-    this.handleGetScenicData()
+    if (this.seat.latitude && this.seat.longitude) {
+      // 景区信息
+      this.handleGetScenicData()
+    }
+
 
     // this.handleAes()
     this.$utils.addUserBehaviorNew({
@@ -761,7 +768,7 @@ export default {
   },
   methods: {
     // 请求景区信息
-    async handleGetScenicData() {
+    async handleGetScenicData(latitude, longitude) {
       let SCENICAREA = uni.getStorageSync("SCENICAREAOBJ");
       let SCENICAREAOBJ = {}
 
@@ -782,8 +789,8 @@ export default {
 
       let req = {
         ProvinceCode: this.user.PROVINCE_CODE,
-        latitude: this.seat.latitude || "",
+        latitude: latitude || this.seat.latitude || "",
-        longitude: this.seat.longitude || "",
+        longitude: longitude || this.seat.longitude || "",
         ServerpartID: this.serviceDetail.SERVERPART_ID || "",
         type: 'encryption'
       }
@@ -1561,6 +1568,8 @@ export default {
           let latitude = res.latitude;
           let longitude = res.longitude;
           _this.handleGetNearService(latitude, longitude);
+          // 获得附近的景区数据
+          _this.handleGetScenicData(latitude, longitude);
         },
         fail: (err) => {
         },
@@ -2043,6 +2052,8 @@ export default {
             }
           })
         }
+        console.log('everyWeekShopDataeveryWeekShopDataeveryWeekShopData', res);
+
         this.everyWeekShopData = res
       })
 

pages/shopMallPage/index/index.vue

@@ -592,7 +592,7 @@
     </div>
 
     <uni-popup ref="priceRangeRef" @maskClick="handleMaskClick">
-      <view class="priceRangeBox">
+      <view class="priceRangeBox" :style="{ bottom: popupBottom + 'px' }">
         <view class="titleBox">
           <view class="closeIcon"></view>
           <text class="title">价格区间</text>
@@ -601,11 +601,13 @@
 
         <view class="inputBox">
           <view class="inputItem">
-            <input placeholder="最低价" v-model="minPrice" type="number" />
+            <input placeholder="最低价" v-model="minPrice" type="number" :adjust-position="false" @focus="handleFocus"
+              @blur="handleBlur" />
           </view>
           <span class="unit">-</span>
           <view class="inputItem">
-            <input placeholder="最高价" v-model="maxPrice" type="number" />
+            <input placeholder="最高价" v-model="maxPrice" type="number" :adjust-position="false" @focus="handleFocus"
+              @blur="handleBlur" />
           </view>
         </view>
 
@@ -708,7 +710,8 @@ export default {
       haveActivity: false, // 是否有活动
       activityObj: {}, // 活动项的具体内容
       activityShopList: [], // 活动商品列表
-      priceRangeRefShow: false
+      priceRangeRefShow: false,
+      popupBottom: 0 // 键盘高度
     };
   },
   computed: {
@@ -831,6 +834,15 @@ export default {
     };
   },
   methods: {
+    handleFocus(e) {
+      console.log('eee', e);
+
+      // 安卓 / iOS 可能不一样，可以用 e.detail.height 获取键盘高度
+      this.popupBottom = 200 // 默认抬高
+    },
+    handleBlur() {
+      this.popupBottom = 0
+    },
     handleMaskClick(e) {
       this.priceRangeRefShow = false
     },
@@ -1122,14 +1134,15 @@ export default {
     },
     // 价格筛选的确认
     async handleConfirm() {
-      console.log("minPrice", this.minPrice);
+
-      console.log("maxPrice", this.maxPrice);
       if (Number(this.minPrice) <= Number(this.maxPrice)) {
       } else {
-        let newMax = Number(this.minPrice);
+        if (this.maxPrice && this.minPrice) {
-        let newMin = Number(this.maxPrice);
+          let newMax = Number(this.minPrice);
-        this.maxPrice = newMax;
+          let newMin = Number(this.maxPrice);
-        this.minPrice = newMin;
+          this.maxPrice = newMax;
+          this.minPrice = newMin;
+        }
       }
       this.showShopList = [];
       this.shopMsg = {
@@ -1431,6 +1444,8 @@ export default {
           }
         });
       }
+      console.log('weeklySpecialOfferweeklySpecialOfferweeklySpecialOfferweeklySpecialOffer', shopList);
+
       this.weeklySpecialOffer = shopList
     },
     // 拿到今日推荐的商品列表 nature 5050
@@ -3286,6 +3301,8 @@ export default {
     border-radius: 32rpx 32rpx 0 0;
     box-sizing: border-box;
     padding: 32rpx;
+    transition: bottom 0.2s;
+    position: fixed;
 
     .titleBox {
       width: 100%;

pages/shopMallPage/shopCar/index.vue

@@ -66,12 +66,13 @@
               <div class="detailLeft">
                 <view style="display: flex">
                   <!-- color="#1890FF" -->
-                  <radio v-if="pageType === 'normal'" :checked="item.select" color="#4BCB7E"
+                  <radio v-if="pageType === 'normal'" :checked="item.select"
-                    @click="handleChangeSelect(item)"></radio>
+                    :color="bigPageType === 'UnionMall' ? '#E43C3D' : '#4BCB7E'" @click="handleChangeSelect(item)">
-                  <radio v-else :checked="item.selectDelete" color="#4BCB7E" @click="handleChangeDelete(item)"></radio>
+                  </radio>
-                  <image class="leftIcon" :src="item.IMAGE_PATH ||
+                  <radio v-else :checked="item.selectDelete"
-                    item.DEFAULT_IMG ||
+                    :color="bigPageType === 'UnionMall' ? '#E43C3D' : '#4BCB7E'" @click="handleChangeDelete(item)">
-                    '/static/images/home/defultImg.png'
+                  </radio>
+                  <image class="leftIcon" :src="item.IMAGE_PATH ? item.IMAGE_PATH.split(',') && item.IMAGE_PATH.split(',').length > 1 ? item.IMAGE_PATH.split(',')[0] : item.IMAGE_PATH : '/static/images/home/defultImg.png'
                     " />
                 </view>
                 <view class="simPriceBox">
@@ -146,9 +147,12 @@
         <text class="sum">合计</text>
         <text class="sumPrice">￥</text>
         <text class="sunNumber">{{ totalPay }}</text>
-        <div class="submitBtn" @click="goPayFn">立即下单</div>
+        <div class="submitBtn" @click="goPayFn"
+          :style="{ background: bigPageType === 'UnionMall' ? '#E43C3D' : '#4BCB7E' }">立即下单</div>
       </div>
-      <div v-else class="deleteBtn" @click="handleDelete">删除</div>
+      <div v-else class="deleteBtn"
+        :style="{ background: bigPageType === 'UnionMall' ? '#F6CFCC' : '#E7F8EE', color: bigPageType === 'UnionMall' ? '#E43C3D' : '#4BCB7E' }"
+        @click="handleDelete">删除</div>
     </div>
 
     <uni-popup ref="addressPopup" :safe-area="false">
@@ -275,8 +279,6 @@ export default {
     });
   },
   onShow() {
-    console.log("this.bigPageType", this.bigPageType);
-    console.log("this.$store.state", this.$store.state);
     // 判断当前的购物车里面是否有东西
     let shopCarList = [];
     if (this.bigPageType === "UnionMall") {
@@ -297,6 +299,30 @@ export default {
 
     this.handleGetAddressList();
   },
+  onHide() {
+    console.log('this.shopListthis.shopListthis.shopList', this.shopList);
+
+    if (this.shopList && this.shopList.length > 0) {
+      let list = JSON.parse(JSON.stringify(this.shopList));
+      list.forEach((item) => {
+        item.cartItemAoumt =
+          Number(item.COMMODITY_MEMBERPRICE) * Number(item.count);
+      });
+      console.log("list", list);
+      // list
+      if (this.pageType === "UnionMall") {
+        this.$store.commit("unionMyShopCar", list);
+      } else {
+        this.$store.commit("myShopCar", list);
+      }
+    } else {
+      if (this.pageType === "UnionMall") {
+        this.$store.commit("unionMyShopCar", []);
+      } else {
+        this.$store.commit("myShopCar", []);
+      }
+    }
+  },
   methods: {
     // 点击地址
     handleClickAddressItem(obj) {
@@ -734,8 +760,23 @@ export default {
         return;
       }
 
+
+
+
       // 判断是不是在工会之家下单 下单的话 就要查询用户余额  余额有的  才能下单
       if (this.bigPageType === "UnionMall") {
+
+        // 还要判断有没有工会商城权限
+        if (!(this.userInfo && this.userInfo.ACCOUNT_BALANCE > 0)) {
+          uni.showToast({
+            title: "您未被纳入工会会员采购名录，如有疑问，请联系工会咨询",
+            icon: "none",
+          });
+          return;
+        }
+
+
+
         if (!(this.userInfo.ACCOUNT_BALANCE > 0)) {
           uni.showToast({
             title: "工会之家余额为0，无法下单！",

pages/shopMallPage/shopType/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="main">
+  <view :class="pageType === 'UnionMall' ? 'main' : 'main newMain'">
     <div class="header" :style="{ paddingTop: menu.top + 'px' }">
       <view class="headerTop" :style="{ height: menu.height + 'px' }">
         <image class="backArrow"
@@ -142,7 +142,8 @@
                     </div>
                     <div class="addReduceBox" v-else>
                       <div class="reduceShopCar" @click.stop="touchReduce($event, item)" v-if="item.showReduce">
-                        <img class="optionBtn" src="/static/images/home/newReduce.png" />
+                        <img class="optionBtn"
+                          :src="pageType === 'UnionMall' ? '/static/images/home/newReduce2.png' : '/static/images/home/newReduce.png'" />
                       </div>
                       <span class="itemCount" v-if="item.count && item.count > 0">{{ item.count }}</span>
                       <div v-if="item.COMMODITY_STOCK > 0" class="addShopCar" @click.stop="touchOnGoods($event, item)"
@@ -151,7 +152,8 @@
                           '_' +
                           item.SELLERCOMMODITYTYPE_ID
                           ">
-                        <img class="optionBtn" src="/static/images/home/newAddIcon.png" />
+                        <img class="optionBtn"
+                          :src="pageType === 'UnionMall' ? '/static/images/home/newAddIcon2.png' : '/static/images/home/newAddIcon.png'" />
                       </div>
                       <div v-else class="shopState">已售罄</div>
                     </div>
@@ -425,7 +427,7 @@ export default {
       shopCarList = this.$store.state.myShopCar;
     }
 
-    console.log("shopCarList", shopCarList);
+    console.log("shopCarList22222222", shopCarList);
     console.log("this.shopCarList", this.shopCarList);
 
     // 判断购物车是否一样
@@ -433,6 +435,8 @@ export default {
     } else {
       if (shopCarList && shopCarList.length > 0) {
         this.shopCarList = shopCarList;
+      } else {
+        this.shopCarList = [];
       }
 
       if (this.pageType === "UnionMall") {
@@ -1214,8 +1218,6 @@ export default {
       let leftAllTypeObj = {};
       // 存储一下出现过的商品小类
       let smallTypeList = [];
-      console.log("handleUpdateLeftAllTypeObj", list);
-      console.log("shopCarList", this.shopCarList);
 
       list.forEach((item) => {
         if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
@@ -1537,15 +1539,16 @@ export default {
 .main {
   width: 100vw;
   height: 100vh;
-  background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
+
+  background-image: url('https://eshangtech.com/minTestImg/unionMallBg.png');
   background-size: 100% 100vh;
   background-repeat: no-repeat;
 
   .header {
     width: 100%;
     box-sizing: border-box;
-    // background: linear-gradient(270deg, #2fa4ff 0%, #197aff 100%);
+    // background: linear-gradient(180deg, #DD3D26 0%, #EFAEAB 100%);
-    background: transparent;
+    // background: transparent;
     padding-bottom: 72rpx;
 
     .headerTop {
@@ -1637,7 +1640,7 @@ export default {
         line-height: 20px;
         padding: 7px 16px;
         // background: #1890ff;
-        background: #4BCB7E;
+        background: linear-gradient(270deg, #FB6C6C 0%, #FF4545 100%);
         border-radius: 17px;
       }
     }
@@ -1748,13 +1751,13 @@ export default {
             }
 
             .tab_active {
-              border: 1px solid #4BCB7E;
+              border: 1px solid #E43C3D;
             }
 
             .tab_txt_active {
               padding: 0 5px;
               // background: #1890ff;
-              background: #4BCB7E;
+              background: #E43C3D;
               border-radius: 8px;
               color: #fff !important;
             }
@@ -1765,7 +1768,13 @@ export default {
               font-weight: 400;
               color: #6c737a;
               line-height: 36rpx;
+              text-align: center;
               margin-top: 4px;
+              display: inline-block;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              width: 80%;
             }
           }
         }
@@ -1827,7 +1836,7 @@ export default {
             background: #fff;
 
             .smallItemTitle {
-              color: #4BCB7E;
+              color: #E43C3D;
             }
           }
 
@@ -1839,7 +1848,7 @@ export default {
             height: 24px;
             top: 50%;
             transform: translateY(-50%);
-            background: #4BCB7E;
+            background: #E43C3D;
           }
         }
 
@@ -2451,4 +2460,71 @@ export default {
     }
   }
 }
+
+.newMain {
+  background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
+  background-size: 100% 100vh;
+  background-repeat: no-repeat;
+
+  .header {
+    // background: linear-gradient(270deg, #2fa4ff 0%, #197aff 100%);
+    background: transparent !important;
+
+    .pageSearch {
+      .searchBtn {
+        background: #4BCB7E !important;
+
+      }
+    }
+  }
+
+  .pageContent {
+    .bigTabBox {
+      .scrollBox {
+        .bigTabItem {
+          .itemBox {
+            .tab_active {
+              border: 1px solid #4BCB7E;
+            }
+
+            .tab_txt_active {
+              padding: 0 5px;
+              // background: #1890ff;
+              background: #4BCB7E;
+              border-radius: 8px;
+              color: #fff !important;
+            }
+          }
+        }
+      }
+    }
+
+    .shopListBox {
+      .smallShopList {
+        .scrollShopBox {
+
+          .selectShopItem {
+            background: #fff;
+
+            .smallItemTitle {
+              color: #4BCB7E;
+            }
+          }
+
+          .selectShopItem:before {
+            content: "";
+            position: absolute;
+            left: 0;
+            width: 4px;
+            height: 24px;
+            top: 50%;
+            transform: translateY(-50%);
+            background: #4BCB7E;
+          }
+
+        }
+      }
+    }
+  }
+}
 </style>

pages/shopMallPage/user/index.vue

@@ -157,6 +157,8 @@ export default {
         count += item.count;
       });
     }
+    console.log('this.shopCarListCountthis.shopCarListCountthis.shopCarListCount', this.shopCarListCount);
+
     this.shopCarListCount = count;
   },
   methods: {

pages/shopPages/shopDetail/index.vue

@@ -395,8 +395,9 @@
       <!-- <view class="home-btn" url="/pages/home/index" open-type="switchTab"
         >首页</view
       > -->
+
       <!-- 积分暂时没有规定 所以 -->
-      <view class="rightBtn" v-if="good.PAY_METHOD !== 2000">
+      <view class="rightBtn" v-if="good.PAY_METHOD !== 2000 && pageType !== 'pointsMall'">
         <div class="addCarBtn" @click="handleShowShopPopup(1)">加入购物车</div>
         <div class="sellOut presale" @click="handleShowShopPopup(4)" v-if="isCountdown">
           预售中
@@ -414,8 +415,8 @@
         </div>
       </view>
 
-      <view class="rightBtn" v-if="good.PAY_METHOD === 2000">
+      <view class="rightBtn" v-if="good.PAY_METHOD === 2000 || pageType === 'pointsMall'">
-        <div class="sellOut" style="width: 100%;">
+        <div class="sellOut" style="width: 100%;border-radius: 16rpx;">
           积分不足
         </div>
       </view>
@@ -1707,6 +1708,7 @@ export default {
     this.safeHeight = Number(height);
     this.menu = uni.getMenuButtonBoundingClientRect();
     console.log("option", option);
+    console.log("user", this.user);
     if (option.pageType) {
       this.pageType = option.pageType;
     }
@@ -1729,8 +1731,6 @@ export default {
 
     await this.getDetail(option.id);
 
-
-
     this.handleGetIsCollect()
 
     this.$utils.addUserBehaviorNew({

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

@@ -212,6 +212,12 @@ var _default = {
             });
           }
         }
+      } else if (pageIndex === "/pages/shopMallPage/user/newIndex") {
+        // 判断是不是在购物车里面  2 表示工会商城  1 表示精选商城
+        uni.setStorageSync("inShop", this.pageType ? 2 : 1);
+        uni.navigateTo({
+          url: "/pages/shopMallPage/user/newIndex"
+        });
       } else {
         if (this.selectIndex === '/pages/shopMallPage/index/index') {
           uni.navigateTo({

unpackage/dist/dev/mp-weixin/components/shopTabbar.wxml

@@ -1 +1 @@
-<view class="main data-v-066c6722" style="{{'z-index:'+(zIndex===98?98:99999)+';'}}"><view class="content _div data-v-066c6722"><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/index/index']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/index/index'?'/static/images/shopTabbar/active_home.png':'/static/images/shopTabbar/home.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/index/index'?'#1890FF':'#3A3D48')+';'}}">首页</label></view><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/shopType/index']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/shopType/index'?'/static/images/shopTabbar/active_classification.png':'/static/images/shopTabbar/classification.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/shopType/index'?'#1890FF':'#3A3D48')+';'}}">分类</label></view><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/shopCar/index']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><block wx:if="{{shopCount>0}}"><label class="shopCarNumber _span data-v-066c6722">{{shopCount}}</label></block><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/shopCar/index'?'/static/images/shopTabbar/active_shopCar.png':'/static/images/shopTabbar/shopCar.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/shopCar/index'?'#1890FF':'#3A3D48')+';'}}">购物车</label></view><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/user/newIndex']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/user/newIndex'?'/static/images/shopTabbar/active_user.png':'/static/images/shopTabbar/user.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/user/newIndex'?'#1890FF':'#3A3D48')+';'}}">我的</label></view></view></view>
+<view class="main data-v-066c6722" style="{{'z-index:'+(zIndex===98?98:99999)+';'}}"><view class="content _div data-v-066c6722"><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/index/index']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/index/index'?'/static/images/shopTabbar/active_home.png':'/static/images/shopTabbar/home.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/index/index'?'#1890FF':'#3A3D48')+';'}}">首页</label></view><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/shopType/index']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/shopType/index'?'/static/images/shopTabbar/active_classification.png':'/static/images/shopTabbar/classification.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/shopType/index'?'#1890FF':'#3A3D48')+';'}}">分类</label></view><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/shopCar/index']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><block wx:if="{{shopCount>0}}"><label class="shopCarNumber _span data-v-066c6722" style="{{'background:'+(pageType==='UnionMall'?'#E43C3D':'#4BCB7E')+';'}}">{{shopCount}}</label></block><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/shopCar/index'?'/static/images/shopTabbar/active_shopCar.png':'/static/images/shopTabbar/shopCar.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/shopCar/index'?'#1890FF':'#3A3D48')+';'}}">购物车</label></view><view data-event-opts="{{[['tap',[['goPages',['/pages/shopMallPage/user/newIndex']]]]]}}" class="tabItem _div data-v-066c6722" bindtap="__e"><image class="tabItemIcon data-v-066c6722" src="{{selectIndex==='/pages/shopMallPage/user/newIndex'?'/static/images/shopTabbar/active_user.png':'/static/images/shopTabbar/user.png'}}"></image><label class="tabItemText _span data-v-066c6722" style="{{'color:'+(selectIndex==='/pages/shopMallPage/user/newIndex'?'#1890FF':'#3A3D48')+';'}}">我的</label></view></view></view>

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

@@ -229,7 +229,7 @@ var _default = {
           url: "/pages/otherFunPage/goPublicPage/index"
         });
         // uni.navigateTo({
-        //   url: `/pages/noDataPage/index`,
+        //   url: `/pages/noDataPage/index`, 
         // });
       } else if (obj.value === 3) {
         // 充电
@@ -316,6 +316,16 @@ var _default = {
       } else if (obj.value === 15) {
         // 商城
         this.handleGoShop();
+      } else if (obj.value === 17) {
+        if (obj.index === 0) {
+          uni.navigateTo({
+            url: "/pages/shopMallPage/shopType/index?comeForm=index"
+          });
+        } else {
+          uni.navigateTo({
+            url: "/pages/highwayHeadlines/attractInvestment"
+          });
+        }
       }
     },
     // 改变状态 是否可以修改位置

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

@@ -139,10 +139,54 @@ var render = function () {
   var l1 = g3 ? _vm.roadStatusList.concat(_vm.roadStatusList) : null
   var g4 = _vm.roadStatusList && _vm.roadStatusList.length === 1
   var g5 = _vm.everyWeekShopData && _vm.everyWeekShopData.length > 0
-  var g6 = _vm.specialOffersList && _vm.specialOffersList.length > 0
+  var l2 = g5
-  var g7 = g6 ? _vm.productsList && _vm.productsList.length > 0 : null
+    ? _vm.__map(_vm.everyWeekShopData, function (item, index) {
-  var g8 = _vm.productsList && _vm.productsList.length > 0
+        var $orig = _vm.__get_orig(item)
-  var g9 = g8 ? _vm.specialOffersList && _vm.specialOffersList.length > 0 : null
+        var g6 = item.IMAGE_PATH
+          ? item.IMAGE_PATH.split(",") && item.IMAGE_PATH.split(",").length > 1
+          : null
+        var g7 = item.IMAGE_PATH && g6 ? item.IMAGE_PATH.split(",") : null
+        return {
+          $orig: $orig,
+          g6: g6,
+          g7: g7,
+        }
+      })
+    : null
+  var g8 = _vm.specialOffersList && _vm.specialOffersList.length > 0
+  var g9 = g8 ? _vm.productsList && _vm.productsList.length > 0 : null
+  var l3 = g8
+    ? _vm.__map(_vm.specialOffersList, function (item, index) {
+        var $orig = _vm.__get_orig(item)
+        var g10 = item.IMAGE_PATH
+          ? item.IMAGE_PATH.split(",") && item.IMAGE_PATH.split(",").length > 1
+          : null
+        var g11 = item.IMAGE_PATH && g10 ? item.IMAGE_PATH.split(",") : null
+        return {
+          $orig: $orig,
+          g10: g10,
+          g11: g11,
+        }
+      })
+    : null
+  var g12 = _vm.productsList && _vm.productsList.length > 0
+  var g13 = g12
+    ? _vm.specialOffersList && _vm.specialOffersList.length > 0
+    : null
+  var l4 = g12
+    ? _vm.__map(_vm.productsList, function (item, index) {
+        var $orig = _vm.__get_orig(item)
+        var g14 = item.IMAGE_PATH
+          ? item.IMAGE_PATH.split(",") && item.IMAGE_PATH.split(",").length > 1
+          : null
+        var g15 = item.IMAGE_PATH && g14 ? item.IMAGE_PATH.split(",") : null
+        return {
+          $orig: $orig,
+          g14: g14,
+          g15: g15,
+        }
+      })
+    : null
   if (!_vm._isMounted) {
     _vm.e0 = function ($event, item) {
       var _temp = arguments[arguments.length - 1].currentTarget.dataset,
@@ -164,10 +208,13 @@ var render = function () {
         l1: l1,
         g4: g4,
         g5: g5,
-        g6: g6,
+        l2: l2,
-        g7: g7,
         g8: g8,
         g9: g9,
+        l3: l3,
+        g12: g12,
+        g13: g13,
+        l4: l4,
       },
     }
   )
@@ -455,8 +502,10 @@ var _default = {
               _this2.handleGetProductsList();
               // 商城的内容
               _this2.handleGetShoppingMall();
-              // 景区信息
+              if (_this2.seat.latitude && _this2.seat.longitude) {
-              _this2.handleGetScenicData();
+                // 景区信息
+                _this2.handleGetScenicData();
+              }
 
               // this.handleAes()
               _this2.$utils.addUserBehaviorNew({
@@ -593,7 +642,7 @@ var _default = {
 
   methods: {
     // 请求景区信息
-    handleGetScenicData: function handleGetScenicData() {
+    handleGetScenicData: function handleGetScenicData(latitude, longitude) {
       var _this5 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
         var SCENICAREA, SCENICAREAOBJ, field, fieldList, req, data, list, res;
@@ -628,8 +677,8 @@ var _default = {
                 _this5.SCENICAREAOBJ = SCENICAREAOBJ;
                 req = {
                   ProvinceCode: _this5.user.PROVINCE_CODE,
-                  latitude: _this5.seat.latitude || "",
+                  latitude: latitude || _this5.seat.latitude || "",
-                  longitude: _this5.seat.longitude || "",
+                  longitude: longitude || _this5.seat.longitude || "",
                   ServerpartID: _this5.serviceDetail.SERVERPART_ID || "",
                   type: 'encryption'
                 };
@@ -1483,6 +1532,8 @@ var _default = {
           var latitude = res.latitude;
           var longitude = res.longitude;
           _this.handleGetNearService(latitude, longitude);
+          // 获得附近的景区数据
+          _this.handleGetScenicData(latitude, longitude);
         },
         fail: function fail(err) {}
       });
@@ -2035,6 +2086,7 @@ var _default = {
             }
           });
         }
+        console.log('everyWeekShopDataeveryWeekShopDataeveryWeekShopData', res);
         _this24.everyWeekShopData = res;
       });
 

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

@@ -497,9 +497,11 @@ var _default = {
       // 活动项的具体内容
       activityShopList: [],
       // 活动商品列表
-      priceRangeRefShow: false
+      priceRangeRefShow: false,
+      popupBottom: 0 // 键盘高度
     };
   },
+
   computed: _objectSpread({}, (0, _vuex.mapGetters)({
     user: "user"
   })),
@@ -633,6 +635,15 @@ var _default = {
     };
   },
   methods: (_methods = {
+    handleFocus: function handleFocus(e) {
+      console.log('eee', e);
+
+      // 安卓 / iOS 可能不一样，可以用 e.detail.height 获取键盘高度
+      this.popupBottom = 200; // 默认抬高
+    },
+    handleBlur: function handleBlur() {
+      this.popupBottom = 0;
+    },
     handleMaskClick: function handleMaskClick(e) {
       this.priceRangeRefShow = false;
     },
@@ -983,13 +994,13 @@ var _default = {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                console.log("minPrice", _this6.minPrice);
-                console.log("maxPrice", _this6.maxPrice);
                 if (Number(_this6.minPrice) <= Number(_this6.maxPrice)) {} else {
-                  newMax = Number(_this6.minPrice);
+                  if (_this6.maxPrice && _this6.minPrice) {
-                  newMin = Number(_this6.maxPrice);
+                    newMax = Number(_this6.minPrice);
-                  _this6.maxPrice = newMax;
+                    newMin = Number(_this6.maxPrice);
-                  _this6.minPrice = newMin;
+                    _this6.maxPrice = newMax;
+                    _this6.minPrice = newMin;
+                  }
                 }
                 _this6.showShopList = [];
                 _this6.shopMsg = {
@@ -998,12 +1009,12 @@ var _default = {
                   isOver: false
                 };
                 // 拿到工会之家的商品列表
-                _context5.next = 7;
+                _context5.next = 5;
                 return _this6.handleGetUnionShopList();
-              case 7:
+              case 5:
                 _this6.$refs.priceRangeRef.close();
                 _this6.priceRangeRefShow = false;
-              case 9:
+              case 7:
               case "end":
                 return _context5.stop();
             }
@@ -1329,6 +1340,7 @@ var _default = {
           }
         });
       }
+      console.log('weeklySpecialOfferweeklySpecialOfferweeklySpecialOfferweeklySpecialOffer', shopList);
       this.weeklySpecialOffer = shopList;
     },
     // 拿到今日推荐的商品列表 nature 5050

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

@@ -1335,6 +1335,8 @@
   border-radius: 32rpx 32rpx 0 0;
   box-sizing: border-box;
   padding: 32rpx;
+  transition: bottom 0.2s;
+  position: fixed;
 }
 .main .priceRangeBox .titleBox.data-v-79c11018 {
   width: 100%;

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

@@ -127,12 +127,18 @@ var render = function () {
   var _c = _vm._self._c || _h
   var l0 = _vm.__map(_vm.shopList, function (item, index) {
     var $orig = _vm.__get_orig(item)
-    var g0 = _vm.$utils.handleFormatNumber(
+    var g0 = item.IMAGE_PATH
+      ? item.IMAGE_PATH.split(",") && item.IMAGE_PATH.split(",").length > 1
+      : null
+    var g1 = item.IMAGE_PATH && g0 ? item.IMAGE_PATH.split(",") : null
+    var g2 = _vm.$utils.handleFormatNumber(
       item.COMMODITY_MEMBERPRICE * item.count
     )
     return {
       $orig: $orig,
       g0: g0,
+      g1: g1,
+      g2: g2,
     }
   })
   _vm.$mp.data = Object.assign(
@@ -311,8 +317,6 @@ var _default = {
     }))();
   },
   onShow: function onShow() {
-    console.log("this.bigPageType", this.bigPageType);
-    console.log("this.$store.state", this.$store.state);
     // 判断当前的购物车里面是否有东西
     var shopCarList = [];
     if (this.bigPageType === "UnionMall") {
@@ -332,6 +336,28 @@ var _default = {
     this.handleSum();
     this.handleGetAddressList();
   },
+  onHide: function onHide() {
+    console.log('this.shopListthis.shopListthis.shopList', this.shopList);
+    if (this.shopList && this.shopList.length > 0) {
+      var list = JSON.parse(JSON.stringify(this.shopList));
+      list.forEach(function (item) {
+        item.cartItemAoumt = Number(item.COMMODITY_MEMBERPRICE) * Number(item.count);
+      });
+      console.log("list", list);
+      // list
+      if (this.pageType === "UnionMall") {
+        this.$store.commit("unionMyShopCar", list);
+      } else {
+        this.$store.commit("myShopCar", list);
+      }
+    } else {
+      if (this.pageType === "UnionMall") {
+        this.$store.commit("unionMyShopCar", []);
+      } else {
+        this.$store.commit("myShopCar", []);
+      }
+    }
+  },
   methods: {
     // 点击地址
     handleClickAddressItem: function handleClickAddressItem(obj) {
@@ -792,6 +818,14 @@ var _default = {
 
       // 判断是不是在工会之家下单 下单的话 就要查询用户余额  余额有的  才能下单
       if (this.bigPageType === "UnionMall") {
+        // 还要判断有没有工会商城权限
+        if (!(this.userInfo && this.userInfo.ACCOUNT_BALANCE > 0)) {
+          uni.showToast({
+            title: "您未被纳入工会会员采购名录，如有疑问，请联系工会咨询",
+            icon: "none"
+          });
+          return;
+        }
         if (!(this.userInfo.ACCOUNT_BALANCE > 0)) {
           uni.showToast({
             title: "工会之家余额为0，无法下单！",

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

@@ -385,13 +385,15 @@ var _default = {
     } else {
       shopCarList = this.$store.state.myShopCar;
     }
-    console.log("shopCarList", shopCarList);
+    console.log("shopCarList22222222", shopCarList);
     console.log("this.shopCarList", this.shopCarList);
 
     // 判断购物车是否一样
     if (JSON.stringify(shopCarList) === JSON.stringify(this.shopCarList)) {} else {
       if (shopCarList && shopCarList.length > 0) {
         this.shopCarList = shopCarList;
+      } else {
+        this.shopCarList = [];
       }
       if (this.pageType === "UnionMall") {
         // 工会之家拿到的商品类型
@@ -1125,8 +1127,6 @@ var _default = {
     var leftAllTypeObj = {};
     // 存储一下出现过的商品小类
     var smallTypeList = [];
-    console.log("handleUpdateLeftAllTypeObj", list);
-    console.log("shopCarList", this.shopCarList);
     list.forEach(function (item) {
       if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0) {
         if (leftAllTypeObj[item.USERDEFINEDTYPE_ID] && leftAllTypeObj[item.USERDEFINEDTYPE_ID].length > 0) {} else {

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

@@ -1,14 +1,13 @@
 .main.data-v-36e5d840 {
   width: 100vw;
   height: 100vh;
-  background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
+  background-image: url('https://eshangtech.com/minTestImg/unionMallBg.png');
   background-size: 100% 100vh;
   background-repeat: no-repeat;
 }
 .main .header.data-v-36e5d840 {
   width: 100%;
   box-sizing: border-box;
-  background: transparent;
   padding-bottom: 72rpx;
 }
 .main .header .headerTop.data-v-36e5d840 {
@@ -88,7 +87,7 @@
   color: #fdfdfd;
   line-height: 20px;
   padding: 7px 16px;
-  background: #4BCB7E;
+  background: linear-gradient(270deg, #FB6C6C 0%, #FF4545 100%);
   border-radius: 17px;
 }
 .main .header .search.data-v-36e5d840 {
@@ -187,11 +186,11 @@
   overflow: hidden;
 }
 .main .pageContent .bigTabBox .scrollBox .bigTabItem .itemBox .tab_active.data-v-36e5d840 {
-  border: 1px solid #4BCB7E;
+  border: 1px solid #E43C3D;
 }
 .main .pageContent .bigTabBox .scrollBox .bigTabItem .itemBox .tab_txt_active.data-v-36e5d840 {
   padding: 0 5px;
-  background: #4BCB7E;
+  background: #E43C3D;
   border-radius: 8px;
   color: #fff !important;
 }
@@ -201,7 +200,13 @@
   font-weight: 400;
   color: #6c737a;
   line-height: 36rpx;
+  text-align: center;
   margin-top: 4px;
+  display: inline-block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 80%;
 }
 .main .pageContent .bigTabBox.data-v-36e5d840 ::-webkit-scrollbar {
   display: none;
@@ -253,7 +258,7 @@
   background: #fff;
 }
 .main .pageContent .shopListBox .smallShopList .scrollShopBox .selectShopItem .smallItemTitle.data-v-36e5d840 {
-  color: #4BCB7E;
+  color: #E43C3D;
 }
 .main .pageContent .shopListBox .smallShopList .scrollShopBox .selectShopItem.data-v-36e5d840:before {
   content: "";
@@ -264,7 +269,7 @@
   top: 50%;
   -webkit-transform: translateY(-50%);
           transform: translateY(-50%);
-  background: #4BCB7E;
+  background: #E43C3D;
 }
 .main .pageContent .shopListBox .smallShopList .scrollShopBox.data-v-36e5d840 ::-webkit-scrollbar {
   display: none;
@@ -792,4 +797,41 @@
   background: linear-gradient(90deg, #ff6d00 0%, #ff3a00 100%);
   border-radius: 16rpx;
 }
+.newMain.data-v-36e5d840 {
+  background-image: url('https://eshangtech.com/minTestImg/pageBg.png');
+  background-size: 100% 100vh;
+  background-repeat: no-repeat;
+}
+.newMain .header.data-v-36e5d840 {
+  background: transparent !important;
+}
+.newMain .header .pageSearch .searchBtn.data-v-36e5d840 {
+  background: #4BCB7E !important;
+}
+.newMain .pageContent .bigTabBox .scrollBox .bigTabItem .itemBox .tab_active.data-v-36e5d840 {
+  border: 1px solid #4BCB7E;
+}
+.newMain .pageContent .bigTabBox .scrollBox .bigTabItem .itemBox .tab_txt_active.data-v-36e5d840 {
+  padding: 0 5px;
+  background: #4BCB7E;
+  border-radius: 8px;
+  color: #fff !important;
+}
+.newMain .pageContent .shopListBox .smallShopList .scrollShopBox .selectShopItem.data-v-36e5d840 {
+  background: #fff;
+}
+.newMain .pageContent .shopListBox .smallShopList .scrollShopBox .selectShopItem .smallItemTitle.data-v-36e5d840 {
+  color: #4BCB7E;
+}
+.newMain .pageContent .shopListBox .smallShopList .scrollShopBox .selectShopItem.data-v-36e5d840:before {
+  content: "";
+  position: absolute;
+  left: 0;
+  width: 4px;
+  height: 24px;
+  top: 50%;
+  -webkit-transform: translateY(-50%);
+          transform: translateY(-50%);
+  background: #4BCB7E;
+}
 

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

@@ -145,15 +145,21 @@ var render = function () {
   var g4 = _vm.good.ContentImgList && _vm.good.ContentImgList.length > 0
   var g5 = _vm.good.ContentImgList && _vm.good.ContentImgList.length > 0
   var g6 =
-    _vm.good.PAY_METHOD !== 2000 && _vm.good.OFF_DATE && !_vm.isCountdown
+    _vm.good.PAY_METHOD !== 2000 &&
+    _vm.pageType !== "pointsMall" &&
+    _vm.good.OFF_DATE &&
+    !_vm.isCountdown
       ? new Date().getTime()
       : null
   var g7 =
-    _vm.good.PAY_METHOD !== 2000 && _vm.good.OFF_DATE && !_vm.isCountdown
+    _vm.good.PAY_METHOD !== 2000 &&
+    _vm.pageType !== "pointsMall" &&
+    _vm.good.OFF_DATE &&
+    !_vm.isCountdown
       ? new Date(_vm.good.OFF_DATE).getTime()
       : null
   var g8 =
-    _vm.good.PAY_METHOD !== 2000
+    _vm.good.PAY_METHOD !== 2000 && _vm.pageType !== "pointsMall"
       ? new Date().getTime() > new Date(_vm.good.OFF_DATE).getTime() &&
         !(_vm.good.OFF_DATE && !_vm.isCountdown)
       : null
@@ -1441,6 +1447,7 @@ var _default = {
               _this8.safeHeight = Number(height);
               _this8.menu = uni.getMenuButtonBoundingClientRect();
               console.log("option", option);
+              console.log("user", _this8.user);
               if (option.pageType) {
                 _this8.pageType = option.pageType;
               }
@@ -1459,9 +1466,9 @@ var _default = {
               if (shopCarList && shopCarList.length > 0) {
                 _this8.shopCarList = shopCarList;
               }
-              _context4.next = 13;
+              _context4.next = 14;
               return _this8.getDetail(option.id);
-            case 13:
+            case 14:
               _this8.handleGetIsCollect();
               _this8.$utils.addUserBehaviorNew({
                 behaviorRecordDesc: "\u67E5\u770B\u5546\u54C1\u3010".concat(_this8.good.COMMODITY_NAME, "\u3011\u8BE6\u60C5")
@@ -1482,7 +1489,7 @@ var _default = {
               // this.pageMsg.buyCount = 1;
 
               // this.getRate();
-            case 15:
+            case 16:
             case "end":
               return _context4.stop();
           }