mobile / yoho-miniapp-ufo · Commits

Go to a project

Authored by 黄涛
Commit 44d85c6f2f4029ec2c6c58f59994d4105ad906fd 2 parents f87bc425 12f3dac5

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

fix cut ufo



See merge request !16
Inline Side-by-side
Showing 3 changed files with 16 additions and 2 deletions
@@ -141,7 +141,7 @@ @@ -141,7 +141,7 @@
141 "id": 15, 141 "id": 15,
142 "name": "定单确认", 142 "name": "定单确认",
143 "pathName": "pages/order/orderConfirm/orderConfirm", 143 "pathName": "pages/order/orderConfirm/orderConfirm",
144 - "query": "product_id=10014834&skup=14044&user_activity_id=1204", 144 + "query": "product_id=10006681&skup=1629313&user_activity_id=47403",
145 "scene": 1011 145 "scene": 1011
146 } 146 }
147 ] 147 ]
@@ -4,13 +4,21 @@ const appid = 'wxc677c88385762287' @@ -4,13 +4,21 @@ const appid = 'wxc677c88385762287'
4 export default { 4 export default {
5 development: { 5 development: {
6 domains: { 6 domains: {
7 - // production 7 + // test
8 api: 'http://java-yohoufo-fore.test3.ingress.dev.yohocorp.com/ufo-gateway', 8 api: 'http://java-yohoufo-fore.test3.ingress.dev.yohocorp.com/ufo-gateway',
9 yohoApi: 'http://api-test3.dev.yohocorp.com', 9 yohoApi: 'http://api-test3.dev.yohocorp.com',
10 yohoLogin: 'http://api-test3.dev.yohocorp.com', 10 yohoLogin: 'http://api-test3.dev.yohocorp.com',
11 activityHost: 'http://yoho-activity-platform.test3.ingress.dev.yohocorp.com', 11 activityHost: 'http://yoho-activity-platform.test3.ingress.dev.yohocorp.com',
12 reportHost: 'https://app.yoho.cn/collect/v3', 12 reportHost: 'https://app.yoho.cn/collect/v3',
13 yasHost: 'https://analysis.yohobuy.com/yas_mobile' 13 yasHost: 'https://analysis.yohobuy.com/yas_mobile'
  14 +
  15 + // production
  16 + // api: 'https://2.yohobuy.com',
  17 + // yohoApi: 'https://api.yoho.cn',
  18 + // yohoLogin: 'https://api.yoho.cn',
  19 + // activityHost: 'https://action.yoho.cn',
  20 + // reportHost: 'https://app.yoho.cn/collect/v3',
  21 + // yasHost: 'https://analysis.yohobuy.com/yas_mobile'
14 }, 22 },
15 apiParams: { 23 apiParams: {
16 client_type: 'miniapp', 24 client_type: 'miniapp',
@@ -38,6 +38,12 @@ @@ -38,6 +38,12 @@
38 <text class='order-detail-sum-grey-txt'>商品金额：</text> 38 <text class='order-detail-sum-grey-txt'>商品金额：</text>
39 <text class='order-detail-sum-grey-txt'>¥{{data.priceInfo.goodPrice}}</text> 39 <text class='order-detail-sum-grey-txt'>¥{{data.priceInfo.goodPrice}}</text>
40 </view> 40 </view>
  41 + <view class='order-detail-count-view' wx:if="{{data.priceInfo.activityCutPrice}}">
  42 + <block wx:if="{{data.priceInfo.activityCutPrice != '0.00' && data.priceInfo.activityCutPrice != '0'}}">
  43 + <text class='order-detail-sum-grey-txt'>活动优惠：</text>
  44 + <text class='order-detail-sum-grey-txt'>-¥{{data.priceInfo.activityCutPrice}}</text>
  45 + </block>
  46 + </view>
41 <view class='order-detail-count-view' wx:if="{{data.isOffline !== 'Y'}}"> 47 <view class='order-detail-count-view' wx:if="{{data.isOffline !== 'Y'}}">
42 <text class='order-detail-sum-grey-txt'>运费：</text> 48 <text class='order-detail-sum-grey-txt'>运费：</text>
43 <text class='order-detail-sum-grey-txt'>¥{{data.priceInfo.feePrice}}</text> 49 <text class='order-detail-sum-grey-txt'>¥{{data.priceInfo.feePrice}}</text>