shish 5 years ago
parent
commit
94a13ade63
2 changed files with 3 additions and 4 deletions
  1. 1 1
      hdApp/src/admin/billing/affirmGhs.vue
  2. 2 3
      hdApp/src/pagesPurchase/order.vue

+ 1 - 1
hdApp/src/admin/billing/affirmGhs.vue

@@ -229,7 +229,7 @@
 						<button @click="form.sendType=1" class="admin-button-com mini-btn" :class="form.sendType==1?'blue':'default'">配送</button>
 						<button @tap="form.sendType=2" class="admin-button-com mini-btn" :class="form.sendType==2?'blue':'default'">自取</button>
 					</tui-list-cell>
-						<appSendTime :placeholder="'留空下单后30分钟内配送'" @alterTime="purchaseFreight(ghsMsg)" :sendDate.sync="form.sendDate" :sendTime.sync="sendTime" ></appSendTime>
+						<appSendTime :placeholder="'默认30分钟内配送'" @alterTime="purchaseFreight(ghsMsg)" :sendDate.sync="form.sendDate" :sendTime.sync="sendTime" ></appSendTime>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="form.sendType == 1">
 						<view class="tui-title ">运费</view>
 						<input type="number" placeholder="留空表示免运费" @input="countAllPrices" v-model="form.sendCost" placeholder-class="tui-placeholder">

+ 2 - 3
hdApp/src/pagesPurchase/order.vue

@@ -109,9 +109,8 @@ export default {
   },
   methods: {
     enter (item) {
-    	const {id,shopId,sjId} = item
-      uni.navigateTo({url: `/pagesPurchase/ghsProduct?shopId=${shopId}&sjId=${sjId}&id=${id}`})
-      // uni.navigateTo({url: '/pagesPurchase/wechatPay'})
+    	const {id,ghsShopId,ghsSjId} = item
+      uni.navigateTo({url: `/pagesPurchase/ghsProduct?shopId=${ghsShopId}&sjId=${ghsSjId}&id=${id}`})
     },
     getGHSList () {
       ghsList().then(res => {