Merge branch 'dev_7.2.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.2.0

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 59,
+			"current": 16,
 			"list": [
 				{
 					"id": -1,
@@ -144,7 +144,7 @@
 					"id": 16,
 					"name": "商品详情页",
 					"pathName": "pages/productDetail/productDetail",
-					"query": "id=628181797502586880",
+					"query": "id=613430263048966144",
 					"scene": null
 				},
 				{

src/shoppingGuid/page/pages/kpi/kpi.wxml

@@ -26,9 +26,9 @@
     wx:for-item="item">
       <view class='status-bar'>
         <view class='status'>
-          已完成:<text>10</text>
+          已完成:<text>{{item.achieve}}</text>
         </view>
-        <view class='percent'>{{utils.toPercent( 10, 100)  }}</view>
+        <view class='percent'>{{item.rate}}</view>
       </view>
       <view class='task-time'>
          <image src='/assets/imgs/shoppingGuide/kpi_task_time.png' mode='widthFix'></image>
@@ -55,9 +55,9 @@
     wx:for-item="item">
       <view class='status-bar'>
         <view class='status'>
-          已完成:<text>10</text>
+          已完成:<text>{{item.achieve}}</text>
         </view>
-        <view class='percent'>{{utils.toPercent( 10, 100)  }}</view>
+        <view class='percent'>{{item.rate}}</view>
       </view>
       <view class='task-time'>
         <image src='/assets/imgs/shoppingGuide/kpi_task_time.png' mode='widthFix'></image>