Merge branch 'zhongqi-delivery' of git.huaml.com:zhh/front-end into zhongqi-delivery

ghsApp/src/admin/billing/result.vue

@@ -18,8 +18,7 @@
 
   <!-- #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>
+    <ad-custom unit-id="adunit-42a99bd9e25e3626" style="width:688upx;"></ad-custom>
   <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
   <!-- #endif -->
 

ghsApp/src/admin/breakage/confirm.vue

@@ -53,7 +53,7 @@
     </view>
     <view class="under-bar">
       <view class="price-view"></view>
-      <button class="admin-button-com blue big" style="width:200upx;" @click="affirmFormSubmit">提交</button>
+      <button class="admin-button-com blue big" style="width:200upx;" @click="affirmFormSubmit">确认</button>
     </view>
 
     <view v-if="isScanEnv" @click="changeGet" style="width:125upx;height:125upx;display:flex;justify-content:center;align-items:center;font-size:60upx;
@@ -238,11 +238,13 @@ export default {
       });
       that.$util.confirmModal({content:'确认报损？'},() => {
           wastage({product:JSON.stringify(product),remark:that.form.remark}).then((res) => {
-            //删除记忆
-            that.removeFromSaveDirect()
-            const {data: { id, orderSn },} = res;
-            that.pageTo({url: '/admin/breakage/result',type:2})
-          });
+            if(res.code == 1){
+              //删除记忆
+              that.removeFromSaveDirect()
+              const {data: { id, orderSn },} = res;
+              that.pageTo({url: '/admin/breakage/result?orderSn='+orderSn+'&id='+id,type:2})
+            }
+          })
       })
     },
     gobackEvent () {

ghsApp/src/admin/breakage/list.vue

@@ -18,13 +18,11 @@
 				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 			</block>
       <view class="app-footer open_btn">
-        <view @click="selectProduct" class="admin-button-com big blue">新增损耗</view>
+        <view @click="selectProduct" class="admin-button-com big blue">新增报损</view>
       </view>
   </div>
 </template>
-
 <script>
-
 import { list } from "@/mixins";
 import { wastageList } from "@/api/wastage";
 export default {
@@ -37,13 +35,13 @@ export default {
   },
   onPullDownRefresh() {
     this.resetList();
-    this._list().then((res) => {
+    this.getBreakList().then((res) => {
       uni.stopPullDownRefresh();
     });
   },
   onReachBottom() {
     if (!this.list.finished) {
-      this._list().then((res) => {
+      this.getBreakList().then((res) => {
         uni.stopPullDownRefresh();
       });
     } else {
@@ -56,7 +54,7 @@ export default {
   },
   onShow() {
   	this.resetList();
-    this._list();
+    this.getBreakList();
   },
   methods: {
     init(){
@@ -64,22 +62,20 @@ export default {
     },
     selectProduct(){
       if(this.$util.isScanEnv()){
-        this.$util.pageTo({url: '/admin/breakage/confirm'})
+        this.$util.pageTo({url: '/admin/breakage/confirm',type:2})
       }else{
-        this.$util.pageTo({url: '/admin/breakage/index'})
+        this.$util.pageTo({url: '/admin/breakage/index',type:2})
       }
     },
-    _list(type, timeArr) {
-      return wastageList({
-        page: this.list.page,
-      }).then((res) => {
+    getBreakList(type, timeArr) {
+      return wastageList({ page: this.list.page, }).then((res) => {
         this.completes(res);
         if (this.$util.isEmpty(res.data)){
           return false
         }
-      });
-    },
-  },
+      })
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>
@@ -103,4 +99,4 @@ export default {
 			}
 		}
 	}
-</style>
+</style>

ghsApp/src/admin/breakage/result.vue

@@ -1,72 +1,60 @@
 <template>
-	<view class="app-content">
-		<view class="billing_box_bg">
-			<view class="top-view"> </view>
-			<view class="result-view">
-				<view class="iconfont iconchenggong"></view>
-				<view class="result-title">报损成功</view>
-				<button class="admin-button-com big blue" style="width:45vw;" @click="goBackHome">返回列表</button>
-			</view>
-		</view>
-	</view>
-</template>
+<appResult :title="title">
+
+  	<button class="admin-button-com big blue" @click="goDetail()">查看详情</button>
+    <button class="admin-button-com big blue" @click="goOn()">继续报损</button>
+	<button class="admin-button-com big" @click="goList()">报损记录</button>
+    <button class="admin-button-com big" @click="goBackHome">返回</button>
+
+    <!-- #ifdef MP-WEIXIN -->
+    <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
+    <ad-custom unit-id="adunit-42a99bd9e25e3626" style="width:688upx;"></ad-custom>
+    <!-- #endif -->
 
+</appResult>
+
+</template>
 <script>
+import appResult from "@/components/app-result"
+import { CURRENT_ENV } from "@/config"
 export default {
-    name: "success",
-	methods: {
-		goBackHome() {
-			uni.navigateBack({})
-		},
-		init(){
-		}
-	}
+  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: "/admin/breakage/info?orderSn="+orderSn,type:2})
+    },
+    goOn(){
+        this.$util.pageTo({url: "/admin/breakage/index",type:2})
+    },
+    goList(){
+        this.$util.pageTo({url: "/admin/breakage/list",type:2})
+    },
+    goBackHome() {
+      uni.navigateBack({ delta: 1 });
+    }
+  },
 };
 </script>
 <style lang="scss" scoped>
-.go-back{
-	width: 80%;
-	height: 80upx;
-	color: #FFFFFF;
-	margin-top: 50upx;
-	background: #3385FF;
-	border-radius: 10upx;
-	font-size:30upx;
-}
-.billing_box_bg {
-	position: relative;
-	padding: 60upx 30upx;
-	display: flex;
-	background: white;
-	flex-direction: column;
-    background-color: #f5f5f5;
-	.top-view {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 299upx;
-		background: #3385ff;
-		border-radius: 0upx 0upx 83upx 83upx;
-	}
-	.result-view {
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding: 70upx;
-		width: 100%;
-		background: #ffffff;
-		border-radius: 20upx;
-		z-index: 1;
-		.iconchenggong {
-			font-size: 170upx;
-			color: $mainColor1;
-		}
-		.result-title {
-			margin: 50upx 0 70upx;
-			font-size: 32upx;
-		}
-	}
+.admin-button-com {
+  margin-bottom:30upx;
+  width: 100%;
 }
 </style>

ghsApp/src/admin/itemClass/more.vue

@@ -1,654 +1,140 @@
 <template>
 	<view class="app-content">
 		<view v-if="!$util.isEmpty(list.data)" style="padding-bottom:120upx;">
-			<view class="sort-list-wrap">
-				<block v-for="(item, index) in list.data" :key="item.id">
-					<view
-						class="sort-item"
-						:class="{
-							dragging: draggedIndex === index,
-							'target-position': targetIndex === index && isDragging && targetIndex !== draggedIndex
-						}"
-						:style="{
-							transform: transformStyle(index),
-							transition: isDragging ? 'none' : 'transform 0.3s ease',
-							zIndex: draggedIndex === index ? 999 : targetIndex === index && isDragging ? 888 : 1
-						}"
-					>
-						<!-- 可拖拽的内容区域 -->
-					<view
-						class="item-content"
-						:data-index="index"
-						:data-id="item.id"
-						@touchstart="dragStart"
-						@touchmove="dragMove"
-						@touchend="dragEnd"
-						style="width: fit-content;"
-					>
-						<view class="item-name">{{ item.name }}</view>
-						<view class="item-index">第{{ index + 1 }}位，按名字可以拖拽</view>
-					</view>
-
-						<!-- 操作按钮区域 -->
-						<view class="buttons-area">
-							<!-- 置顶 -->
-							<view
-								v-if="index > 0"
-								class="move-btn move-btn-top"
-								:class="{ disabled: isOperating }"
-								@click.stop="topFn(item.id)"
-								title="置顶"
-							>
-								<zui-svg-icon icon="general-top-line" color="#fff" :width="20" :height="20" />
-							</view>
-
-							<!-- 置底 -->
-							<view
-								v-if="index < list.data.length - 1"
-								class="move-btn move-btn-bottom"
-								:class="{ disabled: isOperating }"
-								@click.stop="bottomFn(item.id)"
-								title="置底"
-							>
-								<zui-svg-icon icon="general-bottom-line" color="#fff" :width="20" :height="20" />
+			<t-table :headerBackgroundColor="'#F0F2F6'">
+				<t-tr header>
+                    <t-th><view style="color:black;">名称</view></t-th>
+					<t-th><view style="color:black;">排序</view></t-th>
+				</t-tr>
+				<view v-for="(item, index) in list.data" :key="index">
+					<t-tr>
+                        <t-td align="center" color="info">
+						<view style="color:black;font-weight:bold;">{{item.name}}</view>
+						</t-td>
+						<t-td align="center" color="info">
+                            <view>
+							<input v-model="item.inTurn" name="inTurn" @focus="clear(item)"
+							type="number" style="border:1upx solid #cccccc;color:#333333;" />
 							</view>
-
-							<!-- 上移 -->
-							<text
-								v-if="index > 0"
-								class="move-btn move-btn-up"
-								:class="{ disabled: isOperating }"
-								@click.stop="upFn(item.id)"
-								title="上移一位"
-							>↑</text>
-
-							<!-- 下移 -->
-							<text
-								v-if="index < list.data.length - 1"
-								class="move-btn move-btn-down"
-								:class="{ disabled: isOperating }"
-								@click.stop="downFn(item.id)"
-								title="下移一位"
-							>↓</text>
-						</view>
-					</view>
-				</block>
-			</view>
+                        </t-td>
+					</t-tr>
+				</view>
+			</t-table>
 		</view>
 		<view v-else>
 			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 		</view>
+        <view class="app-footer">
+			<view class="admin-button-com big blue" @click="goBack()">返回上级</view>
+		    <view style="margin-left:50upx;" class="admin-button-com big blue" @click="savePrice">保存修改</view>
+		</view>
+
+		<modal-module :show="batchModel" @click="affirmBatch" title="批量操作" color="#333" :size="32" padding="30rpx 30rpx" >
+			<template slot="customContent">
+				<view class="select-cmd_bx">
+					<view class="num_bx" style="margin:60upx 0 60upx 0;font-size:35upx;">
+						<view class="flex">
+						<input v-model="batchNum" placeholder="填写数值" 
+						type="digit" style="border:1upx solid #CCCCCC;height:60upx;margin:0 auto;text-align:center;" />
+						</view>
+					</view>
+				</view>
+			</template>
+		</modal-module>
+
 	</view>
 </template>
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
-import { productList, batchChangeMore } from '@/api/product'
+import { productList,batchChangeMore } from '@/api/product'
 import list from '@/mixins/list'
-
+import ModalModule from "@/components/plugin/modal";
 export default {
 	name: "more",
 	components: {
-		AppWrapperEmpty
+		AppWrapperEmpty,ModalModule
 	},
-	mixins: [list],
+	mixins:[list],
 	data() {
 		return {
-			// 拖拽相关状态
-			draggedIndex: -1,
-			draggedItem: null,
-			dragOffsetY: 0,
-			isDragging: false,
-			itemHeight: 160, // 列表项高度，单位upx（实际高度=160upx）
-			startY: 0,
-			scrollTop: 0, // 页面滚动高度
-			originalOrder: [], // 原始顺序，用于拖拽失败时恢复
-			targetIndex: -1, // 目标交换位置的索引
-			isOperating: false, // 防止快速点击操作按钮
-			totalNum: 0 // 总数量
+            batchModel:false,
+            batchNum:''
 		};
 	},
-	onPageScroll(e) {
-		// 拖拽期间禁止更新滚动高度
-		if (!this.isDragging) {
-			this.scrollTop = e.scrollTop;
-		}
-	},
 	methods: {
-		goBack() {
+		goBack(){
 			uni.navigateBack()
 		},
-		
-		// 响应 transform 样式变化
-		transformStyle(index) {
-			if (index === this.draggedIndex) {
-				return 'translateY(0upx)';
-			}
-			return 'translateY(0upx)';
-		},
-
-		// 拖拽开始
-		dragStart(e) {
-			if (this.isDragging) return;
-
-			this.isDragging = true;
-
-			const index = parseInt(e.currentTarget.dataset.index);
-			if (isNaN(index) || index < 0 || index >= this.list.data.length) {
-				this.isDragging = false;
-				return;
-			}
-
-			this.draggedIndex = index;
-			this.draggedItem = this.list.data[index];
-			this.startY = e.touches[0].clientY;
-			this.targetIndex = index;
-
-			// 保存原始顺序
-			this.originalOrder = [...this.list.data];
-
-			// 添加拖拽模式样式
-			this.toggleDragMode(true);
-
-			if (e.preventDefault) {
-				e.preventDefault();
-			}
-			if (e.stopPropagation) {
-				e.stopPropagation();
-			}
-			return false;
-		},
-
-		// 拖拽移动
-		dragMove(e) {
-			if (!this.isDragging || this.draggedIndex === -1) return;
-
-			if (!e.touches || !e.touches[0]) return;
-
-			if (e.preventDefault) {
-				e.preventDefault();
-			}
-			if (e.stopPropagation) {
-				e.stopPropagation();
-			}
-
-			const currentY = e.touches[0].clientY;
-			const deltaY = currentY - this.startY;
-
-			// 根据设备像素比例转换为upx单位
-			const systemInfo = uni.getSystemInfoSync();
-			const pixelRatio = 750 / systemInfo.windowWidth;
-			const deltaYupx = deltaY * pixelRatio;
-
-			// 限制拖拽范围
-			const maxOffset = (this.list.data.length - 1 - this.draggedIndex) * this.itemHeight;
-			const minOffset = -this.draggedIndex * this.itemHeight;
-			const limitedOffset = Math.max(minOffset, Math.min(maxOffset, deltaYupx));
-
-			this.dragOffsetY = limitedOffset;
-
-			// 实时计算目标位置
-			const moveItems = Math.round(limitedOffset / this.itemHeight);
-			this.targetIndex = Math.max(0, Math.min(this.list.data.length - 1, this.draggedIndex + moveItems));
-		},
-
-		// 拖拽结束
-		dragEnd() {
-			if (!this.isDragging) return;
-
-			// 计算最终位置
-			const moveItems = Math.round(this.dragOffsetY / this.itemHeight);
-			const targetIndex = Math.max(0, Math.min(this.list.data.length - 1, this.draggedIndex + moveItems));
-
-			// 如果位置有变化，则更新数组
-			if (targetIndex !== this.draggedIndex) {
-				const newData = [...this.list.data];
-				const draggedItem = newData[this.draggedIndex];
-
-				newData.splice(this.draggedIndex, 1);
-				newData.splice(targetIndex, 0, draggedItem);
-
-				this.list.data = newData;
-				// 拖拽结束后立即保存
-				this.saveOrder();
-			}
-
-			// 移除拖拽模式样式
-			this.toggleDragMode(false);
-
-			// 重置拖拽状态
-			this.draggedIndex = -1;
-			this.draggedItem = null;
-			this.dragOffsetY = 0;
-			this.isDragging = false;
-			this.startY = 0;
-			this.originalOrder = [];
-			this.targetIndex = -1;
+		clear(item){
+			item.inTurn=''
+			this.$forceUpdate()
 		},
-
-		// 切换拖拽模式
-		toggleDragMode(isDragging) {
-			// #ifdef H5
-			if (isDragging) {
-				document.body.classList.add('dragging-mode');
-			} else {
-				document.body.classList.remove('dragging-mode');
-			}
-			// #endif
-
-			// #ifdef MP-WEIXIN
-			if (typeof uni.setPageStyle !== 'function') {
-				console.warn('uni.setPageStyle is not available on this platform.');
-				return;
-			}
-
-			if (isDragging) {
-				uni.setPageStyle({
-					style: {
-						overflow: 'hidden',
-						position: 'fixed',
-						width: '100%',
-						top: `-${this.scrollTop}px`,
-						left: '0',
-						right: '0'
-					}
-				});
-			} else {
-				uni.setPageStyle({
-					style: {
-						overflow: '',
-						position: '',
-						width: '',
-						top: '',
-						left: '',
-						right: ''
-					}
-				});
-				uni.pageScrollTo({
-					scrollTop: this.scrollTop,
-					duration: 0
-				});
-			}
-			// #endif
-
-			// #ifdef APP-PLUS
-			const webview = this.$scope.$getAppWebview();
-			if (!webview) {
-				console.warn('无法获取 webview。');
-				return;
-			}
-
-			if (isDragging) {
-				webview.evalJS(`
-					var body = document.body;
-					body.style.overflow = 'hidden';
-					body.style.position = 'fixed';
-					body.style.width = '100%';
-					body.style.left = '0';
-					body.style.right = '0';
-					body.style.top = '-${this.scrollTop}px';
-				`);
+		affirmBatch(val) {
+            let that = this
+			if (val.index === 0) {
+                this.batchNum = ''
+				this.batchModel = false;
 			} else {
-				webview.evalJS(`
-					var body = document.body;
-					body.style.overflow = '';
-					body.style.position = '';
-					body.style.width = '';
-					body.style.left = '';
-					body.style.right = '';
-					body.style.top = '';
-				`);
-				uni.pageScrollTo({
-					scrollTop: this.scrollTop,
-					duration: 0
+                if(this.$util.isMoney(this.batchNum) == false){
+                    this.$msg('请填写数值')
+                    return false
+                }
+                let currentNum = Number(this.batchNum)
+                this.list.data.forEach(function(value,index,array){
+					array[index].inTurn =  parseFloat((currentNum).toFixed(2))
 				});
+                this.batchNum = ''
+                this.batchModel = false;
 			}
-			// #endif
 		},
-
-		// 上移
-		upFn(id) {
-			if (this.isOperating) return;
-			this.isOperating = true;
-
-			const index = this.list.data.findIndex((item) => item.id === id);
-			if (index > 0) {
-				const newData = [...this.list.data];
-				const temp = newData[index];
-				newData[index] = newData[index - 1];
-				newData[index - 1] = temp;
-				this.list.data = newData;
-				// 操作后立即保存
-				this.saveOrder();
-			}
-
-			setTimeout(() => {
-				this.isOperating = false;
-			}, 300);
-		},
-
-		// 下移
-		downFn(id) {
-			if (this.isOperating) return;
-			this.isOperating = true;
-
-			const index = this.list.data.findIndex((item) => item.id === id);
-			if (index < this.list.data.length - 1) {
-				const newData = [...this.list.data];
-				const temp = newData[index];
-				newData[index] = newData[index + 1];
-				newData[index + 1] = temp;
-				this.list.data = newData;
-				// 操作后立即保存
-				this.saveOrder();
-			}
-
-			setTimeout(() => {
-				this.isOperating = false;
-			}, 300);
-		},
-
-		// 置顶
-		topFn(id) {
-			if (this.isOperating) return;
-			this.isOperating = true;
-
-			const index = this.list.data.findIndex((item) => item.id === id);
-			if (index > 0) {
-				const newData = [...this.list.data];
-				const targetItem = newData[index];
-
-				newData.splice(index, 1);
-				newData.unshift(targetItem);
-
-				this.list.data = newData;
-				// 操作后立即保存
-				this.saveOrder();
-			}
-
-			setTimeout(() => {
-				this.isOperating = false;
-			}, 300);
-		},
-
-		// 置底
-		bottomFn(id) {
-			if (this.isOperating) return;
-			this.isOperating = true;
-
-			const index = this.list.data.findIndex((item) => item.id === id);
-			if (index < this.list.data.length - 1) {
-				const newData = [...this.list.data];
-				const targetItem = newData[index];
-
-				newData.splice(index, 1);
-				newData.push(targetItem);
-
-				this.list.data = newData;
-				// 操作后立即保存
-				this.saveOrder();
-			}
-
-			setTimeout(() => {
-				this.isOperating = false;
-			}, 300);
-		},
-
-		// 保存排序
-		saveOrder() {
-			let that = this;
-			const sortData = this.list.data.map((item, index) => ({
-				id: item.id,
-				inTurn: this.list.data.length - index // 反向索引，第一个有最大值
-			}));
-			batchChangeMore({ addData: JSON.stringify(sortData) }).then(res => {
-				if (res.code == 1) {
-					//that.$msg('已保存')
+        savePrice(){
+           let that = this
+           let addData = [];
+           uni.showLoading({mask:true})
+		   let mayStop = false
+           this.list.data.forEach(function(value,index,array){
+				if(that.$util.isMoney(value.inTurn) == false){
+					that.$msg('请填写 '+value.name+' 顺序值')
+					mayStop = true
+					return false
 				}
-			})
-		},
-
-		async init() {
+				addData.push({id:value.id,inTurn:value.inTurn})
+           })
+		   if(mayStop == true){
+			return false
+		   }
+           let addString = JSON.stringify(addData)
+           batchChangeMore({addData:addString}).then(res=>{
+               uni.hideLoading()
+               if(res.code == 1){
+					that.$msg(res.msg)
+					that.resetList();
+					that.init()
+               }
+           })
+        },
+		async init(){
 			const res = await productList({
-				page: this.list.page,
-				showPage: 1,
-				pageSize: 2000,
-				classId: this.option.classId
-			});
-			this.completes(res);
-			this.totalNum = res.data && res.data.total ? Number(res.data.total) : this.list.data.length;
+				page:this.list.page,showPage:1,pageSize:2000,classId:this.option.classId
+			})
+			this.completes(res)
 		}
 	},
 	async onPullDownRefresh() {
 		this.resetList();
-		await this.init();
+		await this.init()
 		uni.stopPullDownRefresh();
 	},
 	async onReachBottom() {
 		if (!this.list.finished) {
-			await this.init();
-			uni.stopPullDownRefresh();
+			await this.init()
+			uni.stopPullDownRefresh();;
 		} else {
 			uni.stopPullDownRefresh();
 		}
-	}
+	},
+	
 };
 </script>
 <style lang="scss" scoped>
-.app-content {
-	min-height: 100vh;
-	padding-bottom: 20upx;
-}
-
-.sort-list-wrap {
-	position: relative;
-	background-color: #fff;
-
-		.sort-item {
-			height: 100upx;
-			display: flex;
-			align-items: center;
-			padding: 12upx 0;
-			margin: 0 30upx;
-			color: #333;
-			border-bottom: 1px solid #f0f0f0;
-			position: relative;
-			transition: all 0.3s ease;
-
-			.item-content {
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				width: auto;
-				user-select: none;
-				-webkit-user-select: none;
-				touch-action: none;
-				-webkit-touch-callout: none;
-
-				.item-name {
-					font-size: 28upx;
-					font-weight: bold;
-					color: #000;
-					margin-bottom: 4upx;
-					white-space: nowrap;
-				}
-
-				.item-index {
-					font-size: 22upx;
-					color: #999;
-					white-space: nowrap;
-				}
-			}
-
-		.buttons-area {
-			display: flex;
-			gap: 24upx;
-			align-items: center;
-			padding-left: 20upx;
-			pointer-events: auto;
-			margin-left: auto;
-		}
-		}
-}
-
-.move-btn {
-	position: relative;
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-	width: 50upx;
-	height: 50upx;
-	color: #fff;
-	background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-	border: 2px solid rgba(255, 255, 255, 0.3);
-	border-radius: 50%;
-	font-size: 24upx;
-	font-weight: bold;
-	box-shadow: 0 3upx 10upx rgba(102, 126, 234, 0.25);
-	transition: all 0.2s ease;
-	z-index: 10;
-	cursor: pointer;
-	flex-shrink: 0;
-	/* #ifdef MP-WEIXIN || APP-PLUS || MP-ALIPAY */
-	user-select: none;
-	-webkit-user-select: none;
-	-webkit-touch-callout: none;
-	/* #endif */
-
-	/* 触摸反馈 */
-	&:active {
-		transform: scale(0.92);
-		box-shadow: 0 2upx 6upx rgba(102, 126, 234, 0.4);
-	}
-
-	/* 悬停效果 - 仅在 H5 显示 */
-	/* #ifdef H5 */
-	&:hover:not(.disabled) {
-		transform: translateY(-2upx);
-		box-shadow: 0 4upx 15upx rgba(102, 126, 234, 0.35);
-	}
-	/* #endif */
-}
-
-/* 置顶按钮 - 黄色渐变 */
-.move-btn-top {
-	background: linear-gradient(135deg, #feca57 0%, #ff9ff3 100%);
-	box-shadow: 0 3upx 10upx rgba(254, 202, 87, 0.25);
-
-	&:active {
-		box-shadow: 0 2upx 6upx rgba(254, 202, 87, 0.4);
-	}
-
-	/* #ifdef H5 */
-	&:hover:not(.disabled) {
-		box-shadow: 0 4upx 15upx rgba(254, 202, 87, 0.35);
-	}
-	/* #endif */
-}
-
-/* 置底按钮 - 黄色渐变 */
-.move-btn-bottom {
-	background: linear-gradient(135deg, #feca57 0%, #ff9ff3 100%);
-	box-shadow: 0 3upx 10upx rgba(254, 202, 87, 0.25);
-
-	&:active {
-		box-shadow: 0 2upx 6upx rgba(254, 202, 87, 0.4);
-	}
-
-	/* #ifdef H5 */
-	&:hover:not(.disabled) {
-		box-shadow: 0 4upx 15upx rgba(254, 202, 87, 0.35);
-	}
-	/* #endif */
-}
-
-/* 上移按钮 - 青色渐变 */
-.move-btn-up {
-	background: linear-gradient(135deg, #48dbfb 0%, #0abde3 100%);
-	box-shadow: 0 3upx 10upx rgba(72, 219, 251, 0.25);
-
-	&:active {
-		box-shadow: 0 2upx 6upx rgba(72, 219, 251, 0.4);
-	}
-
-	/* #ifdef H5 */
-	&:hover:not(.disabled) {
-		box-shadow: 0 4upx 15upx rgba(72, 219, 251, 0.35);
-	}
-	/* #endif */
-}
-
-/* 下移按钮 - 青色渐变 */
-.move-btn-down {
-	background: linear-gradient(135deg, #48dbfb 0%, #0abde3 100%);
-	box-shadow: 0 3upx 10upx rgba(72, 219, 251, 0.25);
-
-	&:active {
-		box-shadow: 0 2upx 6upx rgba(72, 219, 251, 0.4);
-	}
-
-	/* #ifdef H5 */
-	&:hover:not(.disabled) {
-		box-shadow: 0 4upx 15upx rgba(72, 219, 251, 0.35);
-	}
-	/* #endif */
-}
-
-/* 按钮禁用状态 */
-.move-btn.disabled {
-	opacity: 0.5;
-	transform: none !important;
-	box-shadow: 0 2upx 6upx rgba(0, 0, 0, 0.08) !important;
-	pointer-events: none;
-	cursor: not-allowed;
-	&:hover,
-	&:active {
-		transform: none !important;
-		box-shadow: 0 2upx 6upx rgba(0, 0, 0, 0.08) !important;
-	}
-}
-
-// 拖拽相关样式
-.sort-list-wrap .sort-item.dragging {
-	border: 2px dashed #007aff !important;
-	box-shadow: 0 8upx 40upx rgba(0, 122, 255, 0.25) !important;
-	background-color: rgba(0, 122, 255, 0.08) !important;
-	opacity: 0.9;
-	border-radius: 16upx;
-	transform: scale(1.02);
-	transition: none !important; /* 拖拽时禁用过渡动画 */
-}
-
-.sort-list-wrap .sort-item.target-position {
-	border: 3px solid #52c41a !important; /* 使用绿色边框区别于拖拽元素 */
-	box-shadow: 0 6upx 30upx rgba(82, 196, 26, 0.3) !important;
-	background-color: rgba(82, 196, 26, 0.1) !important;
-	opacity: 0.95;
-	border-radius: 16upx;
-	transform: scale(1.01);
-	transition: all 0.2s ease !important; /* 目标位置保持平滑过渡 */
-
-	/* 添加一个内部指示器 */
-	&::before {
-		content: '移动到这儿';
-		position: absolute;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		padding: 8upx 22upx;
-		background: linear-gradient(90deg, #52c41a, #73d13d);
-		border-radius: 8upx;
-		color: #fff;
-		font-size: 26upx;
-		font-weight: bold;
-		opacity: 0.9;
-		z-index: 99990;
-	}
-}
-
-/* 防止拖拽时页面滚动 */
-.dragging-mode {
-	overflow: hidden !important;
-	touch-action: none !important;
-	-webkit-overflow-scrolling: auto !important;
-}
 </style>

ghsApp/src/admin/part/confirm.vue

@@ -53,7 +53,7 @@
     </view>
     <view class="under-bar">
       <view class="price-view"></view>
-      <button class="admin-button-com blue big" style="width:200upx;" @click="affirmFormSubmit">提交</button>
+      <button class="admin-button-com blue big" style="width:200upx;" @click="affirmFormSubmit">确认</button>
     </view>
 
     <view v-if="isScanEnv" @click="changeGet" style="width:125upx;height:125upx;display:flex;justify-content:center;align-items:center;font-size:60upx;
@@ -232,10 +232,12 @@ export default {
       });
       that.$util.confirmModal({content:'确认拆散？'},() => {
           partItem({product:JSON.stringify(product),remark:that.form.remark}).then((res) => {
-            that.removeFromSaveDirect()
-            const {data: { id, orderSn },} = res;
-            that.pageTo({url: '/admin/part/result',type:2})
-          });
+            if(res.code == 1){
+              that.removeFromSaveDirect()
+              const {data: { id, orderSn },} = res;
+              that.pageTo({url: '/admin/part/result?orderSn='+orderSn+'&id='+id,type:2})
+            }
+          })
       })
     },
     gobackEvent () {

ghsApp/src/admin/part/list.vue

@@ -63,7 +63,7 @@ export default {
 
     },
     selectProduct(){
-      this.$util.pageTo({url: '/admin/part/index'})
+      this.$util.pageTo({url:'/admin/part/index',type:2})
     },
     getPartList() {
       return partList({

ghsApp/src/admin/part/result.vue

@@ -1,73 +1,63 @@
 <template>
-	<view class="app-content">
-		<view class="billing_box_bg">
-			<view class="top-view"> </view>
-			<view class="result-view">
-				<view class="iconfont iconchenggong"></view>
-				<view class="result-title">拆散成功</view>
-				<button class="admin-button-com big blue" style="width:45vw;" @click="goBackHome">返回</button>
-			</view>
-		</view>
-	</view>
-</template>
+<appResult :title="title">
+
+  	<button class="admin-button-com big blue" @click="goDetail()">查看详情</button>
+    <button class="admin-button-com big blue" @click="goOn()">继续拆散</button>
+	<button class="admin-button-com big" @click="goList">拆散记录</button>
+    <button class="admin-button-com big" @click="goBackHome">返回</button>
+
+    <!-- #ifdef MP-WEIXIN -->
+    <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
+    <ad-custom unit-id="adunit-42a99bd9e25e3626" style="width:688upx;"></ad-custom>
+    <!-- #endif -->
+
+</appResult>
 
+</template>
 <script>
+import appResult from "@/components/app-result"
+import { CURRENT_ENV } from "@/config"
 export default {
-    name: "success",
-	methods: {
-		init(){
-
-		},
-		goBackHome() {
-			uni.navigateBack({})
-		}
-	}
+  name: "result",
+  components: {
+    appResult
+  },
+  mixins: [],
+  data() {
+    return {
+      title:'拆散成功',
+      currentEnv:'production'
+    };
+  },
+  onLoad() {
+    //当前环境
+    this.currentEnv = CURRENT_ENV
+  },
+  methods: {
+    init() {
+      if(this.option.title!=''){
+        this.title = this.option.title
+      }
+    },
+    goDetail() {
+        let orderSn = this.option.orderSn?this.option.orderSn:''
+        this.$util.pageTo({url: "/admin/part/info?orderSn="+orderSn,type:2})
+    },
+    goOn(){
+        this.$util.pageTo({url: "/admin/part/index",type:2})
+    },
+    goList(){
+        this.$util.pageTo({url: "/admin/part/list",type:2})
+    },
+    goBackHome() {
+      uni.navigateBack({ delta: 1 });
+    }
+  },
 };
 </script>
 <style lang="scss" scoped>
-.go-back{
-	width: 80%;
-	height: 80upx;
-	color: #FFFFFF;
-	margin-top: 50upx;
-	background: #3385FF;
-	border-radius: 10upx;
-	font-size:30upx;
-}
-.billing_box_bg {
-	position: relative;
-	padding: 60upx 30upx;
-	display: flex;
-	background: white;
-	flex-direction: column;
-    background-color: #f5f5f5;
-	.top-view {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 299upx;
-		background: #3385ff;
-		border-radius: 0upx 0upx 83upx 83upx;
-	}
-	.result-view {
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding: 70upx;
-		width: 100%;
-		background: #ffffff;
-		border-radius: 20upx;
-		z-index: 1;
-		.iconchenggong {
-			font-size: 170upx;
-			color: $mainColor1;
-		}
-		.result-title {
-			margin: 50upx 0 70upx;
-			font-size: 32upx;
-		}
-	}
+.admin-button-com {
+  margin-bottom:30upx;
+  width: 100%;
 }
 </style>

ghsApp/src/components/app-area-sel.vue

@@ -8,7 +8,7 @@
 				</div>
 				<div class="map-search">
 					<app-search-module ref="aaaaa" fontSize="30" height="120" placeholder="请输入地址搜索" :focus="false" @input="searchFn" />
-					<view style="width:100%;font-size:28upx;text-align:center;padding:10upx 0 15upx 0;color:green;">建议只搜索店名、建筑名、小区名、街道门牌号。例如：隆宇大厦、东昌小区、紫霞路70号</view>
+					<view style="width:100%;font-size:32upx;text-align:center;padding:10upx 0 15upx 0;color:green;font-weight:bold;">建议只搜索店名、建筑名、小区名、街道门牌号。例如：隆宇大厦、东昌小区、紫霞路70号</view>
 				</div>
 				<scroll-view class="near-list" scroll-y>
 					<view v-for="(item,index) in nearListData" :key="index" @click="switchAddress(item,index)" class="near-item">

ghsApp/src/pages.json

@@ -342,7 +342,8 @@
 				{ "path": "details", "style": { "navigationBarTitleText": "详情" } },
 				{ "path": "update", "style": { "navigationBarTitleText": "盘点" } },
 				{ "path": "select", "style": { "navigationBarTitleText": "花材" } },
-				{ "path": "select2", "style": { "navigationBarTitleText": "花材" } }
+				{ "path": "select2", "style": { "navigationBarTitleText": "花材" } },
+				{ "path": "result", "style": { "navigationBarTitleText": "结果","enablePullDownRefresh": false } }
 			]
 		},
 		{
@@ -355,7 +356,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 } }
 			]
 		},
 		{
@@ -407,7 +409,8 @@
 			"pages": [
 				{ "path": "list", "style": { "navigationBarTitleText": "赊账单", "enablePullDownRefresh": true } },
 				{ "path": "details", "style": { "navigationBarTitleText": "赊账单", "enablePullDownRefresh": true } },
-				{ "path": "search", "style": { "navigationBarTitleText": "查找赊账单", "enablePullDownRefresh": false } }
+				{ "path": "search", "style": { "navigationBarTitleText": "查找赊账单", "enablePullDownRefresh": false } },
+				{ "path": "result", "style": { "navigationBarTitleText": "结果", "enablePullDownRefresh": false } }
 			]
 		},
 		{

ghsApp/src/pagesGys/result.vue

@@ -0,0 +1,65 @@
+<template>
+<appResult :title="title">
+
+  	<button class="admin-button-com big blue" @click="goDetail()">查看详情</button>
+    <button class="admin-button-com big blue" @click="goOn()">继续结账</button>
+	<button class="admin-button-com big" @click="selectClear">给其他人结账</button>
+    <button class="admin-button-com big" @click="goList">结账记录</button>
+    <button class="admin-button-com big" @click="goBackHome">返回</button>
+
+    <!-- #ifdef MP-WEIXIN -->
+    <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
+    <ad-custom unit-id="adunit-42a99bd9e25e3626" 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 id = this.option.id?this.option.id:''
+        this.$util.pageTo({url: "/admin/clear/info?id="+id,type:2})
+    },
+    selectClear(){
+        this.$util.pageTo({url: "/pagesPurchase/supplier",type:2})
+    },
+    goOn(){
+        let ghsId = this.option.ghsId ? this.option.ghsId : 0
+        this.$util.pageTo({url: "/pagesGys/search?id="+ghsId,type:2})
+    },
+    goList(){
+        this.$util.pageTo({url: "/admin/clear/list",type:2})
+    },
+    goBackHome() {
+      uni.navigateBack({ delta: 1 });
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.admin-button-com {
+  margin-bottom:30upx;
+  width: 100%;
+}
+</style>

ghsApp/src/pagesGys/search.vue

@@ -142,14 +142,13 @@ export default {
 			that.$util.confirmModal({content:'确认提交？'},() => {
 				uni.showLoading({mask:true})
 				clearOrderApi(params).then(ret=>{
+					that.showClearModel = false
 					uni.hideLoading()
 					if(ret.code == 1){
 						that.getOrderList = []
-						uni.removeStorageSync('selected_cg_ghs_order_clear_'+that.option.id)
-						that.$msg('结账成功')
-						setTimeout(function(){
-							uni.navigateBack({})
-						},1200)
+						uni.removeStorageSync('selected_cg_ghs_order_clear_'+ghsId)
+						let id = ret.data.id?ret.data.id:0
+						that.pageTo({url: '/pagesGys/result?id='+id+'&ghsId='+ghsId,type:2})
 					}
 				})
 			})

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,12 @@
           </view>
         </view>
       </block>
+
+      <!-- #ifdef MP-WEIXIN -->
+        <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
+        <ad-custom unit-id="adunit-42a99bd9e25e3626" style="width:688upx;"></ad-custom>
+      <!-- #endif -->
+
     </view>
 
 		<modal-module :show="wastageShow" @click="confirmWastage" :maskClosable="true" title="报损数量" padding="30rpx 30rpx" >
@@ -78,8 +84,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 +104,13 @@ export default {
 			reduceItemId:0,
 			reduceShow:false,
 			reduceNum:0,
+      currentEnv:'production'
 		};
 	},
+  onLoad() {
+    //当前环境
+    this.currentEnv = CURRENT_ENV
+  },
 	methods: {
     beginReduce(item){
       this.reduceShow = true

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -11,14 +11,14 @@
 
 				<template>
 					<view style="width:690upx;overflow:hidden;padding-left:30upx;">
-						<view class="flex title" v-if="info.status == 3"> 入库前请确认售价: </view>
+						<view class="flex title" v-if="info.status == 3" style="color:#063a86;font-weight:bold;">售价不低于平均成本就有利润</view>
 						<view class="flex title" v-else> 确认售价: </view>
 						<view class="flex title">
 							<text style="font-size:24upx;font-weight:normal;color:#CCCCCC;">
 								<text style="color:black;font-weight:bold;margin:0 3upx 0 0;">花材名称</text>/
 								<text style="color:red;font-weight:normal;margin:0 3upx 0 3upx;">进价</text>/
 								<text style="color:black;font-weight:normal;margin:0 3upx 0 3upx;">本次成本</text>/
-								<text style="color:#3385FF;font-weight:normal;margin:0 3upx 0 3upx;">平均成本</text>/
+								<text style="color:#063a86;font-weight:bold;margin:0 3upx 0 3upx;">平均成本</text>/
 								<text style="color:#CCCCCC;margin:0 3upx 0 3upx;">旧批发价</text>/
 								<text style="color:#CCCCCC;margin:0 3upx 0 3upx;">入库数</text>/
 								<text style="color:#CCCCCC;margin:0 0upx 0 3upx;">原库存</text>
@@ -33,7 +33,7 @@
 											{{res.name?res.name.substr(0,11):''}}
 											<text style="color:red;margin-left:9upx;font-weight:normal;font-size:26upx;">¥{{res.bigPrice?parseFloat(res.bigPrice):0}}</text>
 											<text style="color:black;margin-left:9upx;font-size:26upx;font-weight:normal;">¥{{res.currentCost?parseFloat(res.currentCost):0}}</text>
-											<text style="color:#3385FF;margin-left:9upx;font-weight:normal;font-size:26upx;">¥{{res.cost?parseFloat(res.cost):0}}</text>
+											<text style="color:#063a86;margin-left:9upx;font-weight:bold;font-size:26upx;">¥{{res.cost?parseFloat(res.cost):0}}</text>
 											<text style="color:#CCCCCC;margin-left:9upx;font-weight:normal;font-size:26upx;">旧¥{{res.beforeModifyPrice?parseFloat(res.beforeModifyPrice):0}}</text>
 											<text style="color:#CCCCCC;margin-left:9upx;font-weight:normal;font-size:26upx;">{{res.itemNum?parseFloat(res.itemNum):0}}{{res.bigUnit}}</text>
 											<text style="color:#CCCCCC;margin-left:9upx;font-weight:normal;font-size:26upx;">{{res.beforeModifyStock?parseFloat(res.beforeModifyStock):0}}{{res.bigUnit}}</text>
@@ -197,9 +197,7 @@ export default {
 					if(res.code == 1){
 						if(res.data.status == 4){
 							that.$msg(res.msg)
-							setTimeout(function(){
-								that.pageTo({url: '/pagesPurchase/info?orderSn='+that.info.orderSn+'&refresh=1',type:2})
-							},1100)
+							that.pageTo({url: '/pagesPurchase/result?orderSn='+that.info.orderSn,type:2})
 						}
 					}
 				})
@@ -248,10 +246,7 @@ export default {
 				saveCgPrice({data:JSON.stringify(newProduct),cgId:targetId}).then(res => {
 					uni.hideLoading()
 					if(res.code == 1){
-						that.$msg(res.msg)
-						setTimeout(function(){
-							uni.navigateBack()
-						},1300)
+						that.pageTo({url: '/pagesPurchase/result?orderSn='+that.info.orderSn+'&title=价格已保存',type:2})
 					}
 				})
 			})
@@ -302,10 +297,7 @@ export default {
 			batchChangePrice({data:JSON.stringify(newProduct),changeType:'cg',targetId:targetId,appVersion:1}).then(res => {
 				uni.hideLoading()
 				if(res.code == 1){
-					that.$msg(res.msg)
-					setTimeout(function(){
-						that.pageTo({url: '/pagesPurchase/info?orderSn='+that.info.orderSn+'&refresh=1',type:2})
-					},1100)
+					that.pageTo({url: '/pagesPurchase/result?orderSn='+that.info.orderSn,type:2})
 				}
 			})
 		},

ghsApp/src/pagesPurchase/result.vue

@@ -1,33 +1,63 @@
 <template>
-	<appResult :title="'入库成功'">
-		<button class="admin-button-com blue big" @click="goOn">继续入库</button>
-		<button class="admin-button-com big" @click="goClose">关闭</button>
-	</appResult>
-</template>
+<appResult :title="title">
+
+  	<button class="admin-button-com big blue" @click="goDetail()">查看详情</button>
+    <button class="admin-button-com big blue" @click="goOn()">继续入库</button>
+	<button class="admin-button-com big" @click="goList">入库记录</button>
+    <button class="admin-button-com big" @click="goBackHome">返回</button>
+
+    <!-- #ifdef MP-WEIXIN -->
+    <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
+    <ad-custom unit-id="adunit-42a99bd9e25e3626" style="width:688upx;"></ad-custom>
+    <!-- #endif -->
 
+</appResult>
+
+</template>
 <script>
-import appResult from "@/components/app-result";
+import appResult from "@/components/app-result"
+import { CURRENT_ENV } from "@/config"
 export default {
-	name: "BillingResult", // 开单结果
-	components: {
-		appResult
-	},
-	methods: {
-		goOn() {
-			this.$util.pageTo({ url: "/pagesPurchase/add", type: 2 });
-		},
-		goClose() {
-			this.$util.pageTo({ url: "/pagesPurchase/order", type: 2 });
-		},
-		init(){
-
-		}
-	}
+  name: "result",
+  components: {
+    appResult
+  },
+  mixins: [],
+  data() {
+    return {
+      title:'操作成功',
+      currentEnv:'production'
+    };
+  },
+  onLoad() {
+    //当前环境
+    this.currentEnv = CURRENT_ENV
+  },
+  methods: {
+    init() {
+      if(this.option.title!=''){
+        this.title = this.option.title
+      }
+    },
+    goDetail() {
+        let orderSn = this.option.orderSn?this.option.orderSn:''
+        this.$util.pageTo({url: "/pagesPurchase/info?orderSn="+orderSn,type:2})
+    },
+    goOn(){
+        this.$util.pageTo({url: "/pagesPurchase/supplier",type:2})
+    },
+    goList(){
+        this.$util.pageTo({url: "/pagesPurchase/order",type:2})
+    },
+    goBackHome() {
+      uni.navigateBack({ delta: 1 });
+    }
+  },
 };
 </script>
 <style lang="scss" scoped>
 .admin-button-com {
-	margin-bottom: 20upx;
-	width: 100%;
+  margin-bottom:30upx;
+  width: 100%;
 }
-</style>
+</style>

ghsApp/src/pagesPurchase/supplier.vue

@@ -34,7 +34,7 @@
               <view class="btn_entrance" @click.stop="cgList(item)">采购记录</view>
               <view class="cg-button" @click="goToCg(item)">采购</view>
               <!-- <view class="my-cg-button" @click.stop="goToMyCg(item)">我的</view> -->
-              <view class="search-button" @click.stop="goToSearchDebt(item)">搜</view>
+              <view class="search-button" @click.stop="goToSearchDebt(item)">搜索</view>
               <text class="mobile"></text>
             </view>
 
@@ -205,16 +205,16 @@ export default {
       })
     },
     goToSearchDebt(item){
-      this.pageTo({url: '/pagesGys/search?id='+item.id})
+      this.pageTo({url: '/pagesGys/search?id='+item.id,type:2})
     },
     goToDebtList(item) {
       this.pageTo({url: '/pagesGys/details?id='+item.id})
 		},
     goToCg (item) {
-      this.pageTo({url: '/pagesPurchase/add?ghsId='+item.id+'&ghsName='+item.name+'&location='+item.location})
+      this.pageTo({url: '/pagesPurchase/add?ghsId='+item.id+'&ghsName='+item.name+'&location='+item.location,type:2})
     },
     goToMyCg(item){
-      this.pageTo({url: '/pagesPurchase/add?ghsId='+item.id+'&ghsName='+item.name+'&location='+item.location+'&globalCgMyCharge=1'})
+      this.pageTo({url: '/pagesPurchase/add?ghsId='+item.id+'&ghsName='+item.name+'&location='+item.location+'&globalCgMyCharge=1',type:2})
     }
   }
 }

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,60 @@
+<template>
+<appResult :title="title">
+
+  	<button class="admin-button-com big blue" @click="goDetail()">查看详情</button>
+    <button class="admin-button-com big blue" @click="goOn()">继续出库</button>
+	<button class="admin-button-com big" @click="goList">出库列表</button>
+    <button class="admin-button-com big" @click="goBackHome">返回</button>
+
+    <!-- #ifdef MP-WEIXIN -->
+    <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
+    <ad-custom unit-id="adunit-42a99bd9e25e3626" 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>

ghsApp/src/pagesStorehouse/inventory/details.vue

@@ -62,7 +62,7 @@
 		</view>
 	</view>
 	<view class="bar-view">
-		<view class="info-view"> 盈亏合计 <text class="price-item"> {{ sumCount }}扎 </text> </view>
+		<view class="info-view"> 盈亏合计 <text class="price-item"> {{ sumCount }} </text> </view>
 	</view>
 </view>
 </template>

ghsApp/src/pagesStorehouse/inventory/list.vue

@@ -22,9 +22,9 @@
 			</block>
 		</view>
 		<div class="app-footer open_btn">
-			<div @click="getAllItem()" class="admin-button-com big default" style="margin-right:10upx;">花材下载</div>
-			<div @click="getAllStock()" class="admin-button-com big default" style="margin-right:10upx;">全部库存</div>
-			<div @click="stockInAddEvent" class="admin-button-com big blue" style="margin-right:10upx;">入库盘点</div>
+			<div @click="getAllItem()" class="admin-button-com big default" style="margin-right:15upx;">花材下载</div>
+			<div @click="getAllStock()" class="admin-button-com big default" style="margin-right:15upx;">库存</div>
+			<div @click="stockInAddEvent" class="admin-button-com big blue" style="margin-right:15upx;">入库单盘点</div>
 			<div @click="addEvent" class="admin-button-com big blue">新增盘点</div>
 		</div>
 	</view>
@@ -49,17 +49,17 @@ export default {
 	},
 	onShow() {
 		this.resetList()
-		this._list()
+		this.getPdList()
 	},
 	onPullDownRefresh() {
 		this.resetList()
-		this._list().then(res => {
+		this.getPdList().then(res => {
 			uni.stopPullDownRefresh();
 		});
 	},
 	onReachBottom() {
 		if (!this.list.finished) {
-			this._list().then((res) => {
+			this.getPdList().then((res) => {
 				uni.stopPullDownRefresh();
 			});
 		} else {
@@ -68,7 +68,7 @@ export default {
 	},
 	methods: {
 		getAllStock(){
-			this.$util.pageTo({ url: '/admin/stat/stock'})
+			this.$util.pageTo({ url: '/admin/stat/stock',type:2})
 		},
 		getAllItem(){
 			uni.showLoading({title:'下载中',mask:true})
@@ -102,29 +102,21 @@ export default {
 			})
 		},
 		async init() {
-			this._list();
+			this.getPdList();
 		},
-		_list() {
-			return getCheckOrderListApi({page: this.list.page})
-				.then(res => {
-					this.completes(res);
-				})
-				.catch(err => {
-				});
+		getPdList() {
+			return getCheckOrderListApi({page: this.list.page}).then(res => {
+				this.completes(res)
+			})
 		},
 		stockInAddEvent(){
-			this.$util.pageTo({ url: '/pagesStorehouse/allot/inSelect'})
+			this.$util.pageTo({ url: '/pagesStorehouse/allot/inSelect',type:2})
 		},
 		addEvent() {
-			uni.navigateTo({url: '/pagesStorehouse/inventory/select2?shopId='+this.getLoginInfo.shopId})
+			this.$util.pageTo({ url: '/pagesStorehouse/inventory/select2?shopId='+this.getLoginInfo.shopId,type:2})
 		},
 		gotoDetailsEvent(item) {
-			uni.navigateTo({
-				url: `/pagesStorehouse/inventory/details?orderSn=${item.orderSn}`,
-				success: result => {},
-				fail: () => {},
-				complete: () => {}
-			})
+			uni.navigateTo({ url: `/pagesStorehouse/inventory/details?orderSn=${item.orderSn}` })
 		}
 	}
 };

ghsApp/src/pagesStorehouse/inventory/result.vue

@@ -0,0 +1,69 @@
+<template>
+<appResult :title="title">
+
+  	<button class="admin-button-com big blue" @click="goDetail()">查看详情</button>
+    <button class="admin-button-com big blue" @click="goOn()">继续盘点</button>
+	<button class="admin-button-com big" @click="goList">盘点记录</button>
+    <button class="admin-button-com big" @click="goBackHome">返回</button>
+
+    <!-- #ifdef MP-WEIXIN -->
+    <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
+    <ad-custom unit-id="adunit-42a99bd9e25e3626" 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() {
+      if(this.option.title!=''){
+        this.title = this.option.title
+      }
+    },
+    goDetail() {
+        let orderSn = this.option.orderSn?this.option.orderSn:''
+        this.$util.pageTo({url: "/pagesStorehouse/inventory/details?orderSn="+orderSn,type:2})
+    },
+    goOn(){
+        let pdType = this.option.pdType?this.option.pdType:''
+        let shopId = this.option.shopId?this.option.shopId:0
+        if(pdType == 'stockInPd'){
+            this.$util.pageTo({url: "/pagesStorehouse/allot/inSelect",type:2})
+        }else{
+            this.$util.pageTo({url: "/pagesStorehouse/inventory/select2?shopId="+shopId,type:2})
+        }
+    },
+    goList(){
+        this.$util.pageTo({url: "/pagesStorehouse/inventory/list",type:2})
+    },
+    goBackHome() {
+      uni.navigateBack({ delta: 1 });
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.admin-button-com {
+  margin-bottom:30upx;
+  width: 100%;
+}
+</style>

ghsApp/src/pagesStorehouse/inventory/update.vue

@@ -193,25 +193,19 @@ export default {
 				};
 			});
 			params.itemInfo = JSON.stringify(formatList);
-			//type 1直接确定 2保存草稿后在确定
+			let shopId = this.option.shopId?this.option.shopId:0
+			//type 1直接确定 2保存草稿后再确定
 			if(type==1){
 				checkOrderApi(params).then(res=>{
 					if(res.code == 1){
-						that.$msg("盘点成功");
-						setTimeout(() => {
-							that.removeFromSaveDirect()
-							that.$util.pageTo({ url: "/pagesStorehouse/inventory/details?orderSn="+res.data.orderSn,type:2})
-						}, 1200)
+						that.removeFromSaveDirect()
+						that.$util.pageTo({ url: "/pagesStorehouse/inventory/result?orderSn="+res.data.orderSn+'&shopId='+shopId+'&pdType='+pdType,type:2})
 					}
 				})
 			}else{
 				updateCheckOrderApi(params).then(res=>{
 					if(res.code == 1){
-						that.$msg("提交成功");
-						setTimeout(() => {
-							that.removeFromSaveDirect()
-							that.$util.pageTo({ url: "/pagesStorehouse/inventory/details?orderSn="+res.data.orderSn,type:2})
-						}, 1200)
+						that.$util.pageTo({ url: "/pagesStorehouse/inventory/result?orderSn="+res.data.orderSn+'&shopId='+shopId+'&pdType='+pdType,type:2})
 					}
 				})
 			}

ghsPad/src/pages/home/xj.vue

@@ -16,7 +16,10 @@
 						<input v-model="saveCash" type="digit" class="save-input" @focus="saveCash=''" placeholder="金额" /> 
 						<button class="admin-button-com mini-btn" @click="inAmount()" style="margin-left:30upx;display: inline-block;">存入</button>
 					</view>
-					<view style="width:100%;text-align: center;font-size:20upx;margin-top:20upx;" @click="goBA()">闽CIP备15017325号-12A</view>
+					<view style="width:100%;text-align: center;font-size:20upx;margin-top:20upx;" @click="goBA()">
+						<view>闽CIP备15017325号-12A</view>
+						<view>版本号 {{version}}</view>
+					</view>
 				</view>
 				<view class="custom">
 					<view style="margin-bottom:15upx;"><input v-model="form.name1" type="text" class="custom-input" @focus="form.name1=''" placeholder="客户名称" /> </view>
@@ -61,7 +64,8 @@ export default {
 				name1: "",
 				mobile1: "",
 				confirmMobile1: ""
-			}
+			},
+			version:'1.0.0'
 		}
 	},
 	computed: {
@@ -69,6 +73,11 @@ export default {
 	},
 	onLoad(){
 		this.getMainInfo()
+	    // #ifdef APP-PLUS
+		if(plus.runtime.version){
+			this.version = plus.runtime.version
+		}
+		// #endif
 	},
 	methods: {
 		addCustom() {

hdApp/src/admin/home/workbench.vue

@@ -8,7 +8,7 @@
 	    <!-- #endif -->
       <view style="margin-top:100upx;font-size:34upx;margin-bottom:30upx;">花店登录</view>
       <view><button class="admin-button-com big blue" style="width:240upx;" @click="pageTo({url:'/admin/home/login'})">去登录</button></view>
-      <view style="font-size:38upx;color:green;text-decoration: underline;margin-top:60upx;" @click="pageTo({url:'/pagesClient/official/apply'})">花店注册</view>
+      <view style="font-size:40upx;color:green;text-decoration: underline;margin-top:60upx;" @click="pageTo({url:'/pagesClient/official/apply'})">花店注册</view>
     </view>
   </block>
   <block v-else>

hdApp/src/components/app-area-sel.vue

@@ -9,7 +9,7 @@
 				<!-- 搜索 -->
 				<div class="map-search">
 					<app-search-module ref="aaaaa" placeholder="请填写地址搜索" :focus="false" @input="searchFn"/>
-					<view style="width:100%;font-size:28upx;text-align:center;padding:10upx 0 15upx 0;color:green;">建议只搜索店名、建筑名、小区名、街道门牌号。例如：隆宇大厦、东昌小区、紫霞路70号</view>
+					<view style="width:100%;font-size:32upx;text-align:center;padding:10upx 0 15upx 0;color:green;font-weight:bold;">建议只搜索店名、建筑名、小区名、街道门牌号。例如：隆宇大厦、东昌小区、紫霞路70号</view>
 				</div>
 				<!-- 地图 -->
 				<!-- <div class="map-box">

hdApp/src/pagesPurchase/components/wangCg.vue

@@ -3,8 +3,8 @@
     <image :src="`${constant.hostUrl}/image/ghs/home/deserve.png`" class="noData_img"></image>
     <view style="margin:45upx 0;color:white;font-size:35upx;">如首次下单，请填写门店信息</view>
     <view class="freeApply" @click="apply">填写</view>
-    <view style="margin:50upx 0 45upx 0;color:white;font-size:35upx;">
-      <text>如已经填写过，请直接登录</text>
+    <view style="margin:80upx 0 45upx 0;color:white;font-size:35upx;">
+      <text>如之前已经填写过，请直接登录</text>
     </view>
     <view class="freeApply" @click="goLogin()">登录</view>
   </view>

hdApp/src/pagesPurchase/particulars.vue

@@ -17,8 +17,7 @@
       </view>
       <!-- #ifdef MP-WEIXIN -->
       <view style="width:690upx;height:25upx;background-color: #f5f5f5;"></view>
-      <ad-custom unit-id="adunit-b3f48f1b6c1a39ff" v-if="currentEnv=='production'"></ad-custom>
-      <ad-custom unit-id="adunit-bb3f5872f1a5d549" v-else></ad-custom>
+      <ad-custom unit-id="adunit-b3f48f1b6c1a39ff"></ad-custom>
       <!-- #endif -->
     </view>
   </view>

hdApp/src/pagesPurchase/refundResult.vue

@@ -7,8 +7,7 @@
       <!-- #ifdef MP-WEIXIN -->
       <view style="width:690upx;height:25upx;background-color: #f5f5f5;"></view>
 	  <view style="width:690upx;">
-      	<ad-custom unit-id="adunit-b3f48f1b6c1a39ff" v-if="currentEnv=='production'"></ad-custom>
-		<ad-custom unit-id="adunit-bb3f5872f1a5d549" v-else></ad-custom>
+      	<ad-custom unit-id="adunit-b3f48f1b6c1a39ff"></ad-custom>
 	  </view>
       <!-- #endif -->
 

hdPad/src/pages/home/xj.vue

@@ -15,7 +15,10 @@
 					<input v-model="saveCash" type="digit" class="save-input" @focus="saveCash=''" placeholder="金额" /> 
 					<text @click="inAmount()" style="margin-left:30upx;font-size:34upx;">存入</text>
 				</view>
-				<view style="width:48%;text-align: center;font-size:20upx;margin-top:50upx;" @click="goBA()">闽CIP备15017325号-11A</view>
+				<view style="width:48%;text-align:center;font-size:20upx;margin-top:50upx;" @click="goBA()">
+					<view>闽CIP备15017325号-11A</view>
+					<view>版本号 {{version}}</view>
+				</view>
             </view>
         </view>
     </view>
@@ -45,7 +48,8 @@ export default {
 			currentJobId:0,
 			xjInfo:{},
 			drawCash:'',
-			saveCash:''
+			saveCash:'',
+			version:'1.0.0'
 		}
 	},
 	computed: {
@@ -53,6 +57,11 @@ export default {
 	},
 	onLoad(){
 		this.getMainInfo()
+	    // #ifdef APP-PLUS
+		if(plus.runtime.version){
+			this.version = plus.runtime.version
+		}
+		// #endif
 	},
 	methods: {
 		init(){

mallApp/src/components/app-area-sel.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="map-search">
           <app-search-module ref="aaaaa" height="100" fontSize="32" placeholder="请输入收货地址" :focus="isFocus" @input="searchFn" />
-	        <view style="width:100%;font-size:28upx;text-align:center;padding:10upx 0 15upx 0;color:green;">建议只搜索建筑名、小区名、街道门牌号。例如：隆宇大厦、东昌小区、紫霞路70号</view>
+	        <view style="width:100%;font-size:32upx;text-align:center;padding:10upx 0 15upx 0;color:green;font-weight:bold;">建议只搜索建筑名、小区名、街道门牌号。例如：隆宇大厦、东昌小区、紫霞路70号</view>
         </div>
         <scroll-view class="near-list" scroll-y>
           <view v-for="(item,index) in nearListData" :key="index" @click="switchAddress(item,index)" class="near-item" >