优化

src/app.json

@@ -120,7 +120,7 @@
   ],
   "plugins": {
     "contactPlugin": {
-      "version": "1.0.12",
+      "version": "1.3.0",
       "provider": "wx104a1a20c3f81ec2"
     }
   },

src/component/floatNav/floatNav.js

@@ -185,8 +185,11 @@ Component({
     },
     //处理动画逻辑分4个和5个时
     handlerAnimation(len, index, animationContext) {
-      const translateFour = [[-50, -30], [-80, 20], [-80, 80], [-50, 130]];
-      const translateFive = [[-50, -45], [-90, 0], [-110, 55], [-90, 112], [-50, 155]];
+      // const translateFour = [[-50, -30], [-80, 20], [-80, 80], [-50, 130]];
+      // const translateFive = [[-50, -45], [-90, 0], [-110, 55], [-90, 112], [-50, 155]];
+      const translateFour = [[-50, -80], [-80, -30], [-80, 30], [-50, 80]];
+      const translateFive = [[-50, -100], [-90, -55], [-110, 0], [-90, 55], [-50, 100]];
+
       if (len == 4) {
         animationContext.translate(translateFour[index][0], translateFour[index][1]).rotateZ(360).opacity(1).step();
       }

src/component/floatNav/floatNav.wxss

@@ -4,12 +4,12 @@
   height: 82rpx;
   width: 82rpx;
   position: fixed;
-  /* bottom: 330rpx;
-  right: 25rpx; */
-
-  bottom: 225rpx;
+  bottom: 330rpx;
   right: 25rpx;
 
+  /* bottom: 225rpx;
+  right: 25rpx; */
+
   z-index: 100;
   background-color: rgba(0, 0, 0, 0.4);
   /* background-color: rgba(192, 154, 116, 1); */
@@ -66,7 +66,7 @@
 }
 
 .img-style image{
-  width: 76rpx;
-  height: 76rpx;
+  width: 60rpx;
+  height: 60rpx;
   border-radius: 50%;
 }
\ No newline at end of file

src/component/goGuid/goGuid.js

@@ -25,9 +25,7 @@ Component({
       console.log('组件ready')
       //获取当前环境是不是企业微信
       const currentEnv = wx.getStorageSync('_qyWeChat') ? wx.getStorageSync('_qyWeChat') : null;
-      console.log('currentEnv---', currentEnv)
       const loginUserInfo = wx.getStorageSync('_baseUserInfo') ? wx.getStorageSync('_baseUserInfo') : null;
-      console.log(loginUserInfo)
       if (currentEnv && loginUserInfo){
         console.log(loginUserInfo)
         let qiyeInfo = loginUserInfo.member.qiyeInfo ? loginUserInfo.member.qiyeInfo : null;

src/component/goGuid/goGuid.wxss

@@ -6,7 +6,7 @@
   align-items: center;
   justify-content: center;
   position: fixed;
-  bottom: 320rpx;
+  bottom: 225rpx;
   right: 25rpx;
   width: 82rpx;
   height: 82rpx;

src/component/goHome/goHome.wxss

@@ -5,7 +5,7 @@
   align-items: center;
   justify-content: center;
   position: fixed;
-  bottom: 225rpx;
+  bottom: 330rpx;
   right: 25rpx;
   width: 82rpx;
   height: 82rpx;

src/component/personCenter/personCenter.wxml

@@ -42,7 +42,7 @@
 			<view class='user-id' style="color:{{personCenter.fontColor == 2? '#000' : '#fff'}};">{{memberCardNo}}</view>
 		</view>
 		<view class='qr-code pr'>
-			<image class="qr-code-img" src='/assets/imgs/711_11.png' />
+			<image class="qr-code-img" src='https://img3.bigaka.com/prd/3001/202003/20200309/3001b0c7b943-a805-4550-a179-8b963913b513.png' />
 		</view>
 	</view>
 </view>

src/component/productListStyleOne/productListStyleOne.wxml

@@ -29,7 +29,8 @@
           <view class="pro-member-price" wx:if="{{plusPrice}}">
             <text>￥</text>
             <text class="member-price">{{utils.numberFormat(plusPrice / 100)}}</text>
-            <image mode="widthFix" src="/assets/imgs/7_1_0/plus-sm.png"></image>
+            <image mode="widthFix" 
+            src="https://img3.bigaka.com/prd/3001/202003/20200309/3001042f0b70-edff-4a07-9a98-8e20c8435f01.png"></image>
           </view>
         </view>
       </view>

src/component/productListStyleTwo/productListStyleTwo.wxml

@@ -17,7 +17,7 @@
             <view class="" >
               <image
               class="item-vip"
-              src="./../../assets/imgs/7_1_0/vip.png"
+              src="https://img3.bigaka.com/prd/3001/202003/20200309/3001918ef881-b117-44da-8cfe-72e26f051e29.png"
               mode="widthFix"
               wx:if="{{item.memberPrice}}"
               />

src/component/selectCoupon/selectCoupon.wxml

@@ -28,10 +28,11 @@
 					<image
 					 wx:if="{{false}}"
 					 class="coupon-bg"
-					 src="/assets/imgs/7_1_0/coupon-bg.png"
+					 src="https://img3.bigaka.com/prd/3001/202003/20200309/3001149ce3e2-8eac-4e54-8dbb-cfe8471a8e69.png"
 					 mode="widthFix"
 					/>
-					<image class="coupon-bg" src="/assets/imgs/7_1_0/disabled-coupon.png" mode="widthFix" />
+					<image class="coupon-bg" 
+          src="https://img3.bigaka.com/prd/3001/202003/20200309/300109660331-cc2d-43ec-b3d8-41e2b6634abb.png" mode="widthFix" />
 					<view class="coupon-info">
 						<view class="left-price">
 							<image class="left-price-coupon-bg" src="{{coupon.takeCouponBgimg}}" />

src/component/waterFlowLayout/waterFlowLayout.wxml

@@ -77,7 +77,7 @@
 			 data-id="{{id}}"
 			 data-current-type="{{currentType}}"
 			>
-				<image class="share-img" src="/assets/imgs/share.png" />
+				<image class="share-img" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001843570f0-4ff8-4e72-8d69-9710269420bf.png" />
 				<text class="share-number">{{transmitSum || 0}}</text>
 			</view>
 		</view>

src/component/waterFlowLayoutGoods/waterFlowLayout.wxml

@@ -39,7 +39,7 @@
 			<view class="pro-member-price" wx:if="{{plusPrice}}">
 				<text>￥</text>
 				<text class="member-price">{{utils.numberFormat(plusPrice / 100)}}</text>
-				<image mode="widthFix" src="/assets/imgs/7_1_0/plus-sm.png" />
+				<image mode="widthFix" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001042f0b70-edff-4a07-9a98-8e20c8435f01.png" />
 			</view>
 		</view>
 

src/config/index.js

@@ -6,7 +6,7 @@
 // 修改 BRANCH_ID 为对应的商户id
 // app.js 中brandId 修改为对应
 
-const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
+const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
 //仅生产环境时 配置 ： 
 //3001 3001 ,  wx313ec36b710125d4
 //2006 泰华 , wx40fec8944623c8b3
@@ -21,7 +21,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
 //2015 花在花园
 //2016 阿吉豆
 //2017 ACTREE wx2aae34874e88cdf5
-const BRANCH_ID = 2006
+const BRANCH_ID = 1002
 const isMall = true
 
 // const needMock = '' //

src/pages/IntegralMall/IntegralMall.wxml

@@ -14,7 +14,7 @@
 			<view class="coupon-item">
 				<view class='coupon-img'>
 					<image wx:if="{{item.thumbnail}}" src='{{item.thumbnail}}' />
-					<image wx:else src='/assets/imgs/qr-code.png' />
+					<image wx:else src='https://img3.bigaka.com/prd/3001/202003/20200309/30018086c13a-4579-47ed-a16e-c74cb8010c1d.png' />
 				</view>
 				<view class='coupon-info'>
 					<view class='coupon-time fs-24'>{{item.point}}积分</view>

src/pages/confirmOrder/confirmOrder.wxml

@@ -50,7 +50,8 @@
 				<view class="address-list" bindtap="selectAddress">
 					<view class="address-info">
 						<view>
-							<image class="defalut-add-img" src="{{addressInfo.type == 1 ? '/assets/imgs/7_1_0/08_22/defalut.png' : '/assets/imgs/7_1_0/08_22/no-defalut.png'}}" />
+							<image class="defalut-add-img" 
+              src="{{addressInfo.type == 1 ? 'https://img3.bigaka.com/prd/3001/202003/20200309/3001f7a6186d-6882-422c-a77c-61b8291c091a.png' : 'https://img3.bigaka.com/prd/3001/202003/20200309/300129705d0a-bf5c-4b2f-aedd-0c3fc9f78ba1.png'}}" />
 							<text class="user-name">{{addressInfo.name}}</text>
 							<text class="phone-number">{{addressInfo.phone}}</text>
 						</view>

src/pages/couponDetail/couponDetail.wxml

@@ -2,10 +2,11 @@
 <view class='page-integral-detail'>
 	<view class='coupon-wrap'>
 		<view class='coupon-list'>
-			<image class='coupon-bg' src='/assets/imgs/coupon-bg.png' />
+			<image class='coupon-bg' 
+      src='https://img3.bigaka.com/prd/3001/202003/20200309/300109875abd-15b0-4de3-9673-18d2d1ee4e20.png' />
 			<view class='coupon-img'>
 				<image wx:if="{{couponDetail.couponDetail.style.takeCouponBgimg}}" src='{{couponDetail.couponDetail.style.takeCouponBgimg}}' />
-				<image wx:else src='/assets/imgs/qr-code.png' />
+				<image wx:else src='https://img3.bigaka.com/prd/3001/202003/20200309/30018086c13a-4579-47ed-a16e-c74cb8010c1d.png' />
 			</view>
 			<view class='coupon-info'>
 				<view class='coupon-name fs-28'>{{couponDetail.couponSetting.title}}</view>

src/pages/coupons/coupons.wxml

@@ -22,10 +22,11 @@
 						 data-id="{{item.couponId}}"
 						 bindtap="handelPresentCouponDetail"
 						>
-							<image class='coupon-bg' src='/assets/imgs/coupon-bg.png' />
+							<image class='coupon-bg' 
+              src='https://img3.bigaka.com/prd/3001/202003/20200309/300109875abd-15b0-4de3-9673-18d2d1ee4e20.png' />
 							<view class='coupon-img'>
 								<image wx:if="{{item.takeCouponBgimg}}" class='coupon-bg' src='{{item.takeCouponBgimg}}' />
-								<image wx:else src='/assets/imgs/qr-code.png' />
+								<image wx:else src='https://img3.bigaka.com/prd/3001/202003/20200309/30018086c13a-4579-47ed-a16e-c74cb8010c1d.png' />
 							</view>
 							<view class='coupon-info'>
 								<view class='coupon-name fs-28'>{{item.title}}</view>
@@ -59,12 +60,15 @@
 					>
 						<view class='invalid-coupon' />
 						<!--5 已使用  !5 过期-->
-						<image wx:if="{{item.status == 5}}" src='/assets/imgs/invalid.png' class='invalid-img' />
-						<image wx:else src='/assets/imgs/expired.png' class='invalid-img' />
-						<image class='coupon-bg' src='/assets/imgs/coupon-bg.png' />
+						<image wx:if="{{item.status == 5}}" 
+            src='https://img3.bigaka.com/prd/3001/202003/20200309/3001c35498ca-ec0d-42b5-a46a-afb8f66ce996.png' class='invalid-img' />
+						<image wx:else 
+            src='https://img3.bigaka.com/prd/3001/202003/20200309/30018297bfb0-e2b0-4687-838e-e78463eae06f.png' class='invalid-img' />
+						<image class='coupon-bg' 
+            src='https://img3.bigaka.com/prd/3001/202003/20200309/300109875abd-15b0-4de3-9673-18d2d1ee4e20.png' />
 						<view class='coupon-img'>
 							<image wx:if="{{item.takeCouponBgimg}}" class='coupon-bg' src='{{item.takeCouponBgimg}}' />
-							<image wx:else src='/assets/imgs/qr-code.png' />
+							<image wx:else src='https://img3.bigaka.com/prd/3001/202003/20200309/30018086c13a-4579-47ed-a16e-c74cb8010c1d.png' />
 						</view>
 						<view class='coupon-info'>
 							<view class='coupon-name fs-28'>{{item.title}}</view>

src/pages/integralMallDetail/integralMallDetail.wxml

@@ -5,7 +5,7 @@
 
 			<view class='coupon-img'>
 				<image wx:if="{{integralMallDetail.thumbnail}}" src='{{integralMallDetail.thumbnail}}' />
-				<image wx:else src='/assets/imgs/qr-code.png' />
+				<image wx:else src='https://img3.bigaka.com/prd/3001/202003/20200309/30018086c13a-4579-47ed-a16e-c74cb8010c1d.png' />
 			</view>
 			<view class='coupon-info'>
 				<view class='coupon-name fs-28'>{{integralMallDetail.point}}积分</view>

src/pages/productDetail/productDetail.wxml

@@ -39,11 +39,11 @@
 			 open-type='getUserInfo'
 			 hover-class="btn-hover"
 			>
-				<image class="share-img" src="/assets/imgs/share.png" />
+				<image class="share-img" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001843570f0-4ff8-4e72-8d69-9710269420bf.png" />
 				<text class="share-text">分享</text>
 			</button>
 			<view wx:if="{{currentHasUserInfo}}" class="share-wrap" bindtap="onTapShare">
-				<image class="share-img" src="/assets/imgs/share.png" />
+				<image class="share-img" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001843570f0-4ff8-4e72-8d69-9710269420bf.png" />
 				<text class="share-text">分享</text>
 			</view>
 		</view>

src/pages/wantToBuyDetail/wantToBuyDetail.wxml

@@ -58,7 +58,7 @@
       bindgetuserinfo="_getUserInfo" 
       open-type='getUserInfo' class="clear-btn">
       <view class="share-oprate" bindtap="onTapShare">
-        <image class="share-img" src="/assets/imgs/share.png" />
+        <image class="share-img" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001843570f0-4ff8-4e72-8d69-9710269420bf.png" />
         <text class="share-number">{{contentInfo.transmitSum || 0}}</text>
       </view>
     </button>
@@ -73,7 +73,7 @@
     </view>
 
     <view class="share-oprate" bindtap="onTapShare">
-      <image class="share-img" src="/assets/imgs/share.png" />
+      <image class="share-img" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001843570f0-4ff8-4e72-8d69-9710269420bf.png" />
       <text class="share-number">{{contentInfo.transmitSum || 0}}</text>
     </view>
 

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wx40fec8944623c8b3",
+	"appid": "wxac09792264c49b5c",
 	"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
 	"debugOptions": {
 		"hidedInDevtools": []

src/shoppingGuid/page/pages/achievement/achievement.js

@@ -136,6 +136,11 @@ wxService.page({
     wx.showLoading({
       title: '加载中..',
     });
+    let max = this.getMaxData(series) , disabled = false;
+    if(max == 0){
+      max = 0.1;
+      disabled = true;
+    }
     let self = this;
     let width = app.globalData.systemInfo.screenWidth - 30;
     let chart = new wxCharts({
@@ -149,7 +154,9 @@ wxService.page({
         format: function (val) {
           return val;
         },
-        min: 0
+        min: 0,
+        disabled : disabled,
+        max: max
       },
       xAxis: {
         disableGrid: false,
@@ -186,6 +193,16 @@ wxService.page({
       });
     });
   },
+
+  //获取最大值
+  getMaxData(series){
+    let arr = [];
+    series.forEach(item => {
+      arr = arr.concat(item.data);
+    });
+    let newArr = arr.sort();
+    return newArr[arr.length - 1];
+  },
   
   //导购招募会员概览
   getGuidMemberPreview(){

src/shoppingGuid/page/pages/home/home.wxml

@@ -127,7 +127,8 @@
       >{{item.name}}</view>
     </view>
     <view class='rank-title'>
-      <image class='top20' src='/assets/imgs/shoppingGuide/home_top20.png' mode='aspectFit'></image>
+      <image class='top20' 
+      src='https://img3.bigaka.com/prd/3001/202003/20200309/30014513e137-47fe-41b0-bd30-225f01231127.png' mode='aspectFit'></image>
       <!-- <view class='rank-more'>更多点击查看更多></view> -->
     </view>
     <!-- 招募榜 -->

src/shoppingGuid/page/pages/selectUsers/selectUsers.wxml

@@ -61,7 +61,7 @@
   wx:for-item="item"
   bindtap='onTapToTagUserList'>
     <view class='lf-icon'>
-      <image src='/assets/imgs/shoppingGuide/icon_tag.png' mode='aspectFit'></image>
+      <image src='https://img3.bigaka.com/prd/3001/202003/20200309/3001e3f20d94-976a-40f7-9563-b2867bfb4ef9.png' mode='aspectFit'></image>
     </view>
     <view class='rg-info'>
       <view class='info-top'>

src/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.wxml

@@ -43,7 +43,7 @@
 					<view class='coupon-img-title'>
 						<view class='coupon-img'>
 							<image wx:if="{{item.thumbnail}}" src='{{item.thumbnail}}' />
-							<image wx:else src='/assets/imgs/qr-code.png' />
+							<image wx:else src='https://img3.bigaka.com/prd/3001/202003/20200309/30018086c13a-4579-47ed-a16e-c74cb8010c1d.png' />
 						</view>
 						<view class='coupon-info'>
 							<view class='coupon-name fs-28'>{{item.title}}</view>
@@ -84,7 +84,7 @@
 					<view class='coupon-img-title'>
 						<view class='coupon-img'>
 							<image wx:if="{{item.thumbnail}}" src='{{item.thumbnail}}' />
-							<image wx:else src='/assets/imgs/qr-code.png' />
+							<image wx:else src='https://img3.bigaka.com/prd/3001/202003/20200309/30018086c13a-4579-47ed-a16e-c74cb8010c1d.png' />
 						</view>
 						<view class='coupon-info'>
 							<view class='coupon-name fs-28'>{{item.title}}</view>

src/subPackage/page/pages/IntegrateGoodsExchangeInfo/IntegrateGoodsExchangeInfo.wxml

@@ -4,7 +4,7 @@
 		<view class='coupon-list'>
 			<view class='coupon-img'>
 				<image wx:if="{{integralMallDetail.thumbnail}}" src='{{integralMallDetail.thumbnail}}' />
-				<image wx:else src='/assets/imgs/qr-code.png' />
+				<image wx:else src='https://img3.bigaka.com/prd/3001/202003/20200309/30018086c13a-4579-47ed-a16e-c74cb8010c1d.png' />
 			</view>
 			<view class='coupon-info'>
 				<view class='coupon-name fs-28'>{{integralMallDetail.point}}积分</view>

src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.wxml

@@ -44,7 +44,7 @@
 				<text class="share-number">{{contentInfo.enjoySum || 0}}</text>
 			</view>
 			<view class="share-oprate" bindtap="onTapShare">
-				<image class="share-img" src="/assets/imgs/share.png" />
+				<image class="share-img" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001843570f0-4ff8-4e72-8d69-9710269420bf.png" />
 				<text class="share-number">{{contentInfo.transmitSum || 0}}</text>
 			</view>
 		</view>
@@ -66,7 +66,7 @@
 	<image
 	 class="img-top"
 	 mode="widthFix"
-	 src="/assets/imgs/7_1_0/go-top.png"
+	 src="https://img3.bigaka.com/prd/3001/202003/20200309/300111f08c77-6cf0-4043-bc61-e376dff0031f.png"
 	 bindtap="goTop"
 	/>
 </view> -->

src/subPackage/page/pages/myValueCard/myValueCard.wxml

@@ -20,7 +20,8 @@
       <view class='card-top-info-desc'>
         <text wx:if="{{item.useResidueDays <= 0}}"></text>
         <label wx:if="{{item.useResidueDays > 0}}">剩{{item.leftTimes}}次，{{item.useResidueDays}}天过期</label>
-        <image class='qrcode' src='/assets/imgs/711_11.png' mode='aspectFit'></image>
+        <image class='qrcode' 
+        src='https://img3.bigaka.com/prd/3001/202003/20200309/3001b0c7b943-a805-4550-a179-8b963913b513.png' mode='aspectFit'></image>
       </view>
     </view>
     <!-- 具体信息 -->