From 6c197db98e7dd4256919d3664f6393ef0eb6adbc Mon Sep 17 00:00:00 2001
From: "tianyi@bogon" <ittianyi@163.com>
Date: Sun, 29 Oct 2023 01:19:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/addHangOrder.vue | 40 +++++++++++++++++++++++-------------
 pages/login/login.vue        | 15 +++++++++++---
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/pages/index/addHangOrder.vue b/pages/index/addHangOrder.vue
index a04d2f7..081a9d2 100644
--- a/pages/index/addHangOrder.vue
+++ b/pages/index/addHangOrder.vue
@@ -2,7 +2,7 @@
 <template>
 	<view class="">
 		<view>
-			<button size="default" type="default" @tap="inputDialogToggle('add',categoryId)"
+			<button size="default" type="default" :value="value" @tap="inputDialogToggle('add')"
 				hover-class="is-hover">新增挂单</button>
 		</view>
 		<view class="order-list" v-for="(item, index) in regList" :key="index" @tap="clickCollapse">
@@ -18,7 +18,7 @@
 					<view class="btn-list">
 						<view class="bj-btn" @tap.stop="inputDialogToggle('edit', item)">编辑</view>
 						<view class="bj-btn" @tap.stop="scanCodeAdd">扫码开单</view>
-						<view class="bj-btn" @tap="toggle('center')">语音备注</view>
+						<view class="bj-btn" @tap="toggle('center',item)">语音备注</view>
 					</view>
 					<uni-icons type="bottom" size="25" style="position: absolute;bottom:0;right:30rpx;"></uni-icons>
 				</li>
@@ -59,7 +59,7 @@
 						</view>
 						<view class="popup-bottom">
 							<view class="popup-btn" @touchstart="kaishi" @touchend="jieshu">语音</view>
-							<view class="popup-btn" @tap="">确认</view>
+							<view class="popup-btn" @tap="setDetail">确认</view>
 						</view>
 					</view>
 				</view>
@@ -128,7 +128,7 @@
 		</uni-popup>
 		<!-- 编辑挂单 -->
 		<uni-popup ref="setDialog" type="dialog">
-			<uni-popup-dialog ref="inputClose" mode="input" title="挂单名称" placeholder="请输入挂单名称"
+			<uni-popup-dialog ref="inputClose" mode="input" :value="value" title="挂单名称" placeholder="请输入挂单名称"
 				@confirm="setDetail"></uni-popup-dialog>
 		</uni-popup>
 		<!-- 查看大图弹出层 -->
@@ -150,7 +150,9 @@
 				voiceText: '',
 				recordState: false,
 				pageNumber: 1,
-				regList:[]
+				regList:[],
+				list:[],
+				value:''
 			}
 		},
 		onLoad() {
@@ -253,20 +255,26 @@
 				})
 			},
 			//弹出商品规格选择
-			toggle(type, id) {
+			toggle(type, id) {
+				console.log(id)
 				this.type = type
 				if (type == 'bottom') {
 					this.$refs.shopPopup.open(type)
 					this.getById(id);
-				} else {
+				} else {
+					this.voiceText = id.remark
+					this.list = id
 					this.$refs.popup.open(type)
 				}
 			},
 			//新增挂单弹窗
-			inputDialogToggle(type) {
-				if(type="add"){
+			inputDialogToggle(type,list) {
+				this.value = ''
+				if(type=="add"){
 					this.$refs.inputDialog.open()
-				}else if('edit'){
+				}else if(type=='edit'){
+					this.list = list;
+					this.value = list.saleName
 					this.$refs.setDialog.open()
 				}
 			},
@@ -325,12 +333,16 @@
 			},
 			//编辑挂单信息
 			setDetail(){
-				this.tui.request("/app/sale/setSaleDetail", "POST", {
-					saleDetailList:'',
-					saleId:''
+				console.log(this.value)
+				console.log(this.list.id)
+				console.log(this.voiceText)
+				this.tui.request("/app/sale/updateOrder", "POST", {
+					saleName:this.value,
+					id:this.list.id,
+					remark:this.voiceText
 				}, false, false).then((res) => {
 					if (res.code == 200) {
-						this.tui.toast("删除成功")
+						this.tui.toast("编辑成功") 
 						this.getRegList();
 					} else {
 						this.tui.toast(res.message)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index b12c8f7..50cfcd4 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -174,15 +174,23 @@
 								})
 							}, 200)
 							this.tui.toast('登录成功', 2000, true)
-						} else { //下游客户登录
+						} else if(this.wayValue == 2){ //下游客户登录
 							setTimeout(() => {
 								uni.reLaunch({
 									url: '/pages/other/custom'
 								})
 							}, 200)
 							this.tui.toast('登录成功', 2000, true)
+						}else{
+							uni.setStorageSync('shopName',res.result.shopList[0].shopName)
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '/pages/index/index'
+									// url: '/pages/index/logistics'
+								})
+							}, 200)
+							this.tui.toast('登录成功', 2000, true)
 						}
-
 					} else {
 						this.tui.toast(res.message)
 					}
@@ -193,7 +201,8 @@
 				this.tui.request("/app/sale/delById", "POST", {
 					id: id
 				}, false, false).then((res) => {
-					if (res.code == 200) {
+					if (res.code == 200) {
+						uni.setStorageSync('shopName',res.result.shopName)
 						setTimeout(() => {
 							uni.reLaunch({
 								url: '/pages/index/index'