商城自提+超值卡

src/component/imageSwiper/imageSwiper.wxml

@@ -9,7 +9,7 @@
  duration="{{duration}}"
  style="height: {{maxHeight}}px;"
 >
-	<block wx:for="{{imageList}}" wx:key="swiper{{index}}" wx:for-item="item">
+	<block wx:for="{{imageList}}" wx:key="*this" wx:for-item="item">
 		<swiper-item class="swiper-item">
 			<view wx:if="{{item.needAuth}}">
 				<button

src/component/picNav/picNav.wxml

@@ -3,7 +3,7 @@
 <view class="pic-nav">
 	<view
 	 wx:for="{{newPicNav}}"
-	 wx:key="{{index}}"
+	 wx:key="*this"
 	 wx:for-item="item"
 	 class="nav-block"
 	>

src/component/skuPopup/skuPopup.wxml

@@ -26,7 +26,7 @@
 		 class="sku-info"
 		 wx:for="{{specItem}}"
 		 wx:for-index="i"
-		 wx:key="{{i}}"
+		 wx:key="*this"
 		>
 			<view class="spec-name">{{item.name}}</view>
 			<view

src/config/index.js

@@ -7,7 +7,7 @@
 // app.js 中brandId 修改为对应
 
 
-const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test, 预生产 pre
+const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
 //仅生产环境时 配置 ： 
 //3001 3001 , 
 //泰华 2006 , 
@@ -112,6 +112,7 @@ const prod_brand_config = {
     hasTrial: false, // 是否有体验账号
     isMall: isMall,// 商城或门户 true 商城 false 门户
     orderingMustOpenCard : false, //下单是否必须卡开
+    isOpenSelfMention : true, // 是否开启门店自提
   },
   //泰华配置
   2006: {
@@ -125,6 +126,7 @@ const prod_brand_config = {
     hasTrial: false,
     isMall: isMall,
     orderingMustOpenCard: true,
+    isOpenSelfMention: true, // 是否开启门店自提
   },
   //多多一上
   2007 : {
@@ -137,6 +139,7 @@ const prod_brand_config = {
     hasTrial: false,
     isMall: isMall,
     orderingMustOpenCard: false,
+    isOpenSelfMention: false, // 是否开启门店自提
   },
   //雪岛书屋 
   2008 : {
@@ -149,6 +152,7 @@ const prod_brand_config = {
     hasTrial: false,
     isMall: isMall,
     orderingMustOpenCard: false,
+    isOpenSelfMention: false, // 是否开启门店自提
   },
   //苏州邻里
   2003 : {
@@ -161,6 +165,7 @@ const prod_brand_config = {
     hasTrial: false,
     isMall: isMall,
     orderingMustOpenCard: false,
+    isOpenSelfMention: false, // 是否开启门店自提
   }
 }
 
@@ -201,6 +206,7 @@ const prodImgCtx = 'https://img3.bigaka.com/prd' // 生产环境图片地址
 const config = {
   dev: devCtx,
   test: testCtx,
+  test_store: testCtx,
   pre: preCtx,
   prod: prodCtx
 }
@@ -208,12 +214,14 @@ const config = {
 const appId = {
   dev: 'wxc3b64b09b1d3dfc2',//appid_dev_wx
   test: 'wxac09792264c49b5c',//appid_test_wx 1002商城
+  test_store: 'wx857ea77f4f7f4f34',//appid_test_wx 1002商城
   pre: 'wxac09792264c49b5c',//appid_test_wx 1002商城
 }
 
 const imgConfig = {
   dev: devImgCtx,
   test: testImgCtx,
+  test_store: testImgCtx,
   pre: preImgCtx,
   prod: prodImgCtx
 }
@@ -221,6 +229,7 @@ const imgConfig = {
 const token = {
   dev: 'brand1001', //开发
   test: 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', //测试
+  test_store: 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', //测试
   pre: 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', //预生产
 }
 
@@ -233,8 +242,9 @@ let plusIsOpen = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].plusIsOpen
 let contactUsPluginId = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].contactUsPluginId : '766c50920993bf9c41c6c3d2761a2df5';
 let contactUsIsOpen = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].contactUsIsOpen : true;
 let hasTrial = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].hasTrial : true;
-let fixed_IsMall = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].isMall : true;
+let fixed_IsMall = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].isMall : isMall;
 let orderingMustOpenCard = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].orderingMustOpenCard : false;
+let isOpenSelfMention = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].isOpenSelfMention : true;
 
 //配置信息导出
 const envInfo = (() => {
@@ -251,6 +261,7 @@ const envInfo = (() => {
     hasTrial: hasTrial , //是否开启体验者功能
     isMall: fixed_IsMall,//商城和门户区分 门户时 false; 商城 true
     orderingMustOpenCard: orderingMustOpenCard,//下单时是否强校验必须开卡 true 必须开卡才可下单 false 不开卡可以下单
+    isOpenSelfMention: isOpenSelfMention,//门店是否开启门店自提功能
   }
 })()
 

src/pages/confirmOrder/confirmOrder.wxml

@@ -3,14 +3,14 @@
 
 <view class="page-confirm-order">
   <!-- 选择方式 -->
-  <view class="deliveryType">
-    <view class="de-type-item {{currentType == 'delivery' ? 'active' : ''}}" data-type="delivery" bindtap="onTapChangeType">快递配送</view>
-    <view class="de-type-item {{currentType == 'selfPickUp' ? 'active' : ''}}" data-type="selfPickUp" bindtap="onTapChangeType">门店自提</view>
+  <view class="deliveryType" wx:if="{{isOpenSelfMention}}">
+    <view class="de-type-item {{currentType == 'delivery' ? 'active' : ''}}" 
+    data-type="delivery" bindtap="onTapChangeType">快递配送</view>
+    <view class="de-type-item {{currentType == 'selfPickUp' ? 'active' : ''}}" 
+    data-type="selfPickUp" bindtap="onTapChangeType">门店自提</view>
   </view>
 
 	<form bindsubmit="formSubmit">
-    
-
     <!-- 快递地址 -->
 		<view class="address-wrap" wx:if="{{currentType == 'delivery'}}">
 			<block wx:if="{{goodsAddress}}">
@@ -69,14 +69,16 @@
 		</view>
     <!--  自提门店地址 -->
     <view class="pick-up" wx:if="{{currentType == 'selfPickUp'}}">
-      <view class="address-title">提货地址</view>
-
+      <!-- <view class="address-title">提货地址</view> -->
       <view class="store-address" wx:if="{{storeInfo.storeId}}" bindtap="onTapSelectStore">
         <view class="store-top">
-          <text>张江高科一店</text>
+          <view class="store-name">
+            <view class="add-label">提货地址</view>
+            <text>{{storeInfo.storeName}}</text>
+          </view>
           <image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" />
         </view>
-        <view class="store-addr-info">上海市浦东新区张江高科祖冲之路2288弄3号楼5楼</view>
+        <view class="store-addr-info">{{storeInfo.storeAddress}}</view>
       </view>
       <!-- 未选择门店时 -->
       <view class="store-address" wx:if="{{!storeInfo.storeId}}" bindtap="onTapSelectStore">
@@ -94,7 +96,7 @@
 		<view class="gray-line" />
 		<!-- 商品列表 -->
 		<view class="pro-wrap">
-			<block wx:for="{{currentOrderList.tradePreviewSkus}}" wx:key="{{item}}">
+			<block wx:for="{{currentOrderList.tradePreviewSkus}}" wx:key="*this">
 				<view class="pro-list">
 					<image class="pro-img" src="{{item.skuImgUrl}}" />
 					<view class="pro-info">

src/pages/confirmOrder/confirmOrder.wxss

@@ -384,9 +384,26 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  font-size: 24rpx;
+  font-size: 28rpx;
   color: #333333;
-  margin-bottom: 8rpx;
+  margin-bottom: 10rpx;
+}
+
+.pick-up .store-address .store-top .store-name{
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 550;
+  display: flex;
+  align-items: center;
+}
+
+.pick-up .store-address .store-top .store-name .add-label{
+  font-size: 20rpx;
+  padding: 4rpx 6rpx;
+  background: #ff2222;
+  color: #ffffff;
+  border-radius: 19rpx;
+  margin-right: 10rpx;
 }
 
 .pick-up .store-address .store-top image{

src/pages/userCenter/userCenter.wxml

@@ -2,7 +2,7 @@
   
 <view class='user-center' style="background: {{pageBackgroundColor == 1? '#eee': '#fff'}};min-height: {{outoHeigth}}px">
 	<!-- 1 轮播 2 个人中心 3 图片导航 4 底部左划 5 底部 Tab 6 公告 7 分类 8 关注公众号 9 plus(9/5-权重高)-->
-	<block wx:for="{{pages}}" wx:key="{{index}}" wx:for-item="pItem">
+	<block wx:for="{{pages}}" wx:key="*this" wx:for-item="pItem">
 		<view wx:if="{{pItem.type == 1}}">
 			<image-swiper 
       image-data="{{pItem.rotationchart.images}}" 
@@ -11,7 +11,10 @@
       currentHasUserInfo="{{currentHasUserInfo}}"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 2}}">
-			 <person-center isVip="{{isVip}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" base-user-info="{{baseUserInfo}}" person-data="{{pItem.customer}}" integral-num="{{integralNum}}" valueCardNum="{{valueCardNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
+			 <person-center isVip="{{isVip}}" bind:getAuth="_getUserInfo" 
+       currentHasUserInfo="{{currentHasUserInfo}}" base-user-info="{{baseUserInfo}}" 
+       person-data="{{pItem.customer}}" integral-num="{{integralNum}}" 
+       valueCardNum="{{valueCardNum}}" coupon-num="{{couponNum}}" token="{{token}}"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 3}}">
 			<pic-nav 
@@ -24,19 +27,23 @@
 			<bottom bottom="{{pItem.bottom}}" />
 		</view>
 		<view class="" wx:if="{{pItem.type == 5}}">
-			<bottom-tabs currHomePageId="{{currHomePageId}}"  bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" tab-bar="{{pItem.tabBar}}" bind:updatePage="updatePage"/>
+			<bottom-tabs currHomePageId="{{currHomePageId}}"  
+      bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" 
+      tab-bar="{{pItem.tabBar}}" bind:updatePage="updatePage"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 6}}">
 			<announcement notice="{{pItem.notice}}"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 7}}">
-			<tab-sort currHomePageId="{{currHomePageId}}" category-type="{{pItem.categoryType}}" bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" bind:updatePage="updatePage"/>
+			<tab-sort currHomePageId="{{currHomePageId}}" category-type="{{pItem.categoryType}}" 
+      bind:getAuth="_getUserInfo" currentHasUserInfo="{{currentHasUserInfo}}" bind:updatePage="updatePage"/>
 		</view>
 		<view class="" wx:if="{{pItem.type == 8}}">
 			<attention focus-wx="{{pItem.focusWx}}" />
 		</view>
 		<view class="" wx:if="{{pItem.type == 9}}">
-			<plus sku-list="{{skuVOList}}" plus-bgi="{{pItem.plus}}" currentHasUserInfo="{{currentHasUserInfo}}" bind:updatePage="updatePage"/>
+			<plus sku-list="{{skuVOList}}" plus-bgi="{{pItem.plus}}" 
+      currentHasUserInfo="{{currentHasUserInfo}}" bind:updatePage="updatePage"/>
 		</view>
 	</block>
 </view>

src/subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.js

@@ -170,6 +170,7 @@ wxService.page({
   },
   //申请退款
   handelRequestRefund(e) {
+    
     const id = this.data.id;
     const detail = this.data.orderInfo;
     detail.id = this.data.id;
@@ -182,6 +183,15 @@ wxService.page({
       item.count = item.canRefundNum;
     });
 
+    
+    delete copyOrderInfo.store;
+    delete copyOrderInfo.storeAddress;
+    delete copyOrderInfo.storeCode;
+    delete copyOrderInfo.storeId;
+    delete copyOrderInfo.storeName;
+    delete copyOrderInfo.latitude;
+    delete copyOrderInfo.longitude;
+
     let params = JSON.stringify(copyOrderInfo);
     // 退款申请
     wxService.router(`/pages/refund/refund`).search({params})

src/subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.wxml

@@ -75,7 +75,7 @@
   wx:if="{{orderInfo.status == 'P'}}"
   bindtap="handelConfirmReceipt" >确认收货</view>
   <view class="bto-btn" 
-  wx:if="{{orderInfo.status == 'P'}}" 
+  wx:if="{{orderInfo.status == 'P' && canApplyRefund}}" 
   bindtap="handelRequestRefund">申请退款</view>
   <view class="bto-btn primary-red" 
   wx:if="{{orderInfo.status == 'N'}}" bindtap="onTapPayNow">立即支付</view>

src/subPackage/page/pages/selfPickUpOrderList/selfPickUpOrderList.wxss

@@ -38,6 +38,9 @@ view{
   display: flex;
   justify-content: flex-end;
   align-items: center;
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 550;
 }
 
 .order-list .order-items .top-order-store .store-name{
@@ -46,6 +49,12 @@ view{
   align-items: center;
 }
 
+.order-list .order-items .top-order-store .store-name text{
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: 550;
+}
+
 .order-list .order-items .top-order-store .store-name image{
   width: 24rpx;
   height: 24rpx;

src/utils/wxService.js

@@ -594,6 +594,7 @@ class WXService extends Http {
     config.data.contactUsPluginId = envInfo.contactUsPluginId;
     config.data.contactUsIsOpen = envInfo.contactUsIsOpen;
     config.data.orderingMustOpenCard = envInfo.orderingMustOpenCard;
+    config.data.isOpenSelfMention = envInfo.isOpenSelfMention;
 
     const CONFIG_PAPGE = {
       onLoad: function (...args) {