Merge branch 'feature/group-miniapp' into 'release/6.9.5'

fix cut ufo



See merge request !16

@@ -141,7 +141,7 @@
 					"id": 15,
 					"name": "定单确认",
 					"pathName": "pages/order/orderConfirm/orderConfirm",
-					"query": "product_id=10014834&skup=14044&user_activity_id=1204",
+					"query": "product_id=10006681&skup=1629313&user_activity_id=47403",
 					"scene": 1011
 				}
 			]

@@ -4,13 +4,21 @@ const appid = 'wxc677c88385762287'
 export default {
   development: {
     domains: {
-      // production
+       // test
       api: 'http://java-yohoufo-fore.test3.ingress.dev.yohocorp.com/ufo-gateway',
       yohoApi: 'http://api-test3.dev.yohocorp.com',
       yohoLogin: 'http://api-test3.dev.yohocorp.com',
       activityHost: 'http://yoho-activity-platform.test3.ingress.dev.yohocorp.com',
       reportHost: 'https://app.yoho.cn/collect/v3',
       yasHost: 'https://analysis.yohobuy.com/yas_mobile'
+
+      // production
+      // api: 'https://2.yohobuy.com',
+      // yohoApi: 'https://api.yoho.cn',
+      // yohoLogin: 'https://api.yoho.cn',
+      // activityHost: 'https://action.yoho.cn',
+      // reportHost: 'https://app.yoho.cn/collect/v3',
+      // yasHost: 'https://analysis.yohobuy.com/yas_mobile'
     },
     apiParams: {
       client_type: 'miniapp',

@@ -38,6 +38,12 @@
     <text class='order-detail-sum-grey-txt'>商品金额：</text>
     <text class='order-detail-sum-grey-txt'>¥{{data.priceInfo.goodPrice}}</text>
   </view>
+    <view class='order-detail-count-view' wx:if="{{data.priceInfo.activityCutPrice}}">
+    <block wx:if="{{data.priceInfo.activityCutPrice != '0.00' && data.priceInfo.activityCutPrice != '0'}}">
+      <text class='order-detail-sum-grey-txt'>活动优惠：</text>
+      <text class='order-detail-sum-grey-txt'>-¥{{data.priceInfo.activityCutPrice}}</text>
+    </block>
+  </view>
   <view class='order-detail-count-view' wx:if="{{data.isOffline !== 'Y'}}">
     <text class='order-detail-sum-grey-txt'>运费：</text>
     <text class='order-detail-sum-grey-txt'>¥{{data.priceInfo.feePrice}}</text>