广告优化

ghsApp/src/pages.json

@@ -355,7 +355,8 @@
 				{ "path": "putDetails", "style": { "navigationBarTitleText": "详情" } },
 				{ "path": "modifyDetails", "style": { "navigationBarTitleText": "修改数量" } },
 				{ "path": "allotPut", "style": { "navigationBarTitleText": "调拨入库", "enablePullDownRefresh": true } },
-				{ "path": "inSelect", "style": { "navigationBarTitleText": "请选择入库单", "enablePullDownRefresh": true } }
+				{ "path": "inSelect", "style": { "navigationBarTitleText": "请选择入库单", "enablePullDownRefresh": true } },
+				{ "path": "result", "style": { "navigationBarTitleText": "结果", "enablePullDownRefresh": false } }
 			]
 		},
 		{

ghsApp/src/pagesOrder/refundSuccess.vue

@@ -3,7 +3,7 @@
     <button class="admin-button-com big blue" style="width:80%;" @click="goBack">返回</button>
     <view v-if="!$util.isEmpty(itemList)" style="margin-top:20upx;">
       <block v-for="(item, index) in itemList" :key="index">
-        <view style="text-align:center;margin-bottom:10upx;">
+        <view style="text-align:center;margin-bottom:20upx;">
           <text style="font-size:32upx;" @click="pageTo({url:'/admin/item/detail?id='+item.productId})">
             {{item.name}} <text style="color:#3385FF;margin-left:8upx;">已退{{item.xhNum}}{{item.xhUnitName}}</text>
           </text>
@@ -26,6 +26,13 @@
           </view>
         </view>
       </block>
+
+      <!-- #ifdef MP-WEIXIN -->
+        <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
+        <ad-custom unit-id="adunit-42a99bd9e25e3626" v-if="currentEnv=='production'" style="width:688upx;"></ad-custom>
+        <ad-custom unit-id="adunit-9523c840341ccb1f" v-else style="width:688upx;"></ad-custom>
+      <!-- #endif -->
+
     </view>
 
 		<modal-module :show="wastageShow" @click="confirmWastage" :maskClosable="true" title="报损数量" padding="30rpx 30rpx" >
@@ -78,8 +85,9 @@
 import appResult from "@/components/app-result";
 import { refundDetail,refundWaste,changeRefundOption,refundReduce } from "@/api/refund";
 import ModalModule from "@/components/plugin/modal"
+import { CURRENT_ENV } from "@/config"
 export default {
-  name: "commonSuccess",
+  name: "refundSuccess",
   components: {
     appResult,
     ModalModule
@@ -97,8 +105,13 @@ export default {
 			reduceItemId:0,
 			reduceShow:false,
 			reduceNum:0,
+      currentEnv:'production'
 		};
 	},
+  onLoad() {
+    //当前环境
+    this.currentEnv = CURRENT_ENV
+  },
 	methods: {
     beginReduce(item){
       this.reduceShow = true

ghsApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -72,9 +72,7 @@
           <text></text>
         </text>
       </view>
-      <button class="admin-button-com blue big" @click="stockOutFn(1)" 
-      style="width:300upx;background-color:green;border:1upx solid green;">确认出库</button>
-      <!--<button class="admin-button-com blue big" @click="stockOutFn(0)">确认出库</button>-->
+      <button class="admin-button-com blue big" @click="stockOutFn(1)">确认出库</button>
     </view>
 
     <view v-if="isScanEnv" @click="changeGet" style="width:125upx;height:125upx;display:flex;justify-content:center;align-items:center;font-size:60upx;
@@ -208,9 +206,7 @@ export default {
         if(data.orderSn){
           that.$msg("提交成功")
           that.removeFromSaveDirect()
-          setTimeout(function(){
-            that.pageTo({url:'/pagesStorehouse/allot/exDetails',query:{orderSn:data.orderSn}, type: 2})
-          },1500)
+          that.pageTo({url:'/pagesStorehouse/allot/result?orderSn='+data.orderSn, type: 2})
         }else{
           that.$msg('提交失败')
         }

ghsApp/src/pagesStorehouse/allot/allotEx.vue

@@ -152,11 +152,9 @@ export default {
 			this._list();
 		},
 		_list() {
-			return getStockOutListApi({status:this.tabs[this.tabIndex].key,page: this.list.page})
-				.then(res => {
-					this.completes(res);
-				})
-				.catch(err => {});
+			return getStockOutListApi({status:this.tabs[this.tabIndex].key,page: this.list.page}).then(res => {
+				this.completes(res)
+			})
 		},
 		changeTabEvent(info) {
 			const { index } = info;
@@ -184,15 +182,10 @@ export default {
 			return name;
 		},
 		addEvent() {
-			uni.navigateTo({url: `/admin/shop/selectShop`})
+			this.$util.pageTo({url: "/admin/shop/selectShop",type:2})
 		},
 		gotoDetails(item) {
-			uni.navigateTo({
-				url: `/pagesStorehouse/allot/exDetails?orderSn=${item.orderSn}`,
-				success: result => {},
-				fail: () => {},
-				complete: () => {}
-			});
+			uni.navigateTo({ url: `/pagesStorehouse/allot/exDetails?orderSn=${item.orderSn}` })
 		}
 	}
 };

ghsApp/src/pagesStorehouse/allot/result.vue

@@ -0,0 +1,61 @@
+<template>
+<appResult :title="title">
+
+  	<button class="admin-button-com big" @click="goDetail()">查看详情</button>
+    <button class="admin-button-com big" @click="goOn()">继续出库</button>
+	<button class="admin-button-com big default" @click="goList">出库列表</button>
+    <button class="admin-button-com big default" @click="goBackHome">返回</button>
+
+    <!-- #ifdef MP-WEIXIN -->
+    <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
+    <ad-custom unit-id="adunit-42a99bd9e25e3626" v-if="currentEnv=='production'" style="width:688upx;"></ad-custom>
+    <ad-custom unit-id="adunit-9523c840341ccb1f" v-else style="width:688upx;"></ad-custom>
+    <!-- #endif -->
+
+</appResult>
+
+</template>
+<script>
+import appResult from "@/components/app-result"
+import { CURRENT_ENV } from "@/config"
+export default {
+  name: "result",
+  components: {
+    appResult
+  },
+  mixins: [],
+  data() {
+    return {
+      title:'调拨成功',
+      currentEnv:'production'
+    };
+  },
+  onLoad() {
+    //当前环境
+    this.currentEnv = CURRENT_ENV
+  },
+  methods: {
+    init() {
+    },
+    goDetail() {
+        let orderSn = this.option.orderSn?this.option.orderSn:''
+        this.$util.pageTo({url: "/pagesStorehouse/allot/exDetails?orderSn="+orderSn,type:2})
+    },
+    goOn(){
+        this.$util.pageTo({url: "/admin/shop/selectShop",type:2})
+    },
+    goList(){
+        this.$util.pageTo({url: "/pagesStorehouse/allot/allotEx",type:2})
+    },
+    goBackHome() {
+      uni.navigateBack({ delta: 1 });
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.admin-button-com {
+  margin-bottom:30upx;
+  width: 100%;
+}
+</style>