shish 2 лет назад
Родитель
Сommit
8539670215
3 измененных файлов с 9 добавлено и 4 удалено
  1. 2 1
      ghsApp/src/pagesOrder/arrival.vue
  2. 1 1
      ghsApp/src/pagesOrder/detail.vue
  3. 6 2
      ghsApp/src/pagesOrder/result.vue

+ 2 - 1
ghsApp/src/pagesOrder/arrival.vue

@@ -269,7 +269,8 @@ export default {
 			that.$util.confirmModal({content:'确认提交'},() => {
 			that.$util.confirmModal({content:'确认提交'},() => {
 				arrival({id:that.option.id,product:JSON.stringify(product),packCost:that.packCost,sendCost:that.sendCost}).then(res=>{
 				arrival({id:that.option.id,product:JSON.stringify(product),packCost:that.packCost,sendCost:that.sendCost}).then(res=>{
 					if(res.code == 1){
 					if(res.code == 1){
-						that.pageTo({url: '/pagesOrder/result',type:2})
+						let id = res.data.id ? res.data.id : 0
+						that.pageTo({url: '/pagesOrder/result?id='+id,type:2})
 					}
 					}
 				})        
 				})        
 			})
 			})

+ 1 - 1
ghsApp/src/pagesOrder/detail.vue

@@ -853,7 +853,7 @@ export default {
 				this.freeShipModal = true;
 				this.freeShipModal = true;
 			}else if(s.type === 'arrival'){
 			}else if(s.type === 'arrival'){
 				//到货
 				//到货
-				this.pageTo({url: "/pagesOrder/arrival",query: {id: item.id}});
+				this.pageTo({url: "/pagesOrder/arrival?id="+item.id,type:2});
 			} else if (s.type === "print") {
 			} else if (s.type === "print") {
 				if(item.hasCloudPrint == 1){
 				if(item.hasCloudPrint == 1){
 					let that = this
 					let that = this

+ 6 - 2
ghsApp/src/pagesOrder/result.vue

@@ -5,12 +5,12 @@
 			<view class="result-view">
 			<view class="result-view">
 				<view class="iconfont iconchenggong"></view>
 				<view class="iconfont iconchenggong"></view>
 				<view class="result-title">操作成功</view>
 				<view class="result-title">操作成功</view>
-				<button class="admin-button-com big blue" style="width:45vw;" @click="goBackHome">返回</button>
+				<button class="admin-button-com big blue" style="width:60vw;margin-bottom:50upx;" @click="goDetail()">订单详情</button>
+				<button class="admin-button-com big default" style="width:60vw;" @click="goBackHome">返回</button>
 			</view>
 			</view>
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>
-
 <script>
 <script>
 export default {
 export default {
     name: "success",
     name: "success",
@@ -20,6 +20,10 @@ export default {
 		},
 		},
 		goBackHome() {
 		goBackHome() {
 			uni.navigateBack({})
 			uni.navigateBack({})
+		},
+		goDetail(){
+			let id = this.option.id?this.option.id:0
+			this.pageTo({url: '/pagesOrder/detail?id='+id,type:2})
 		}
 		}
 	}
 	}
 };
 };