shish 3 lat temu
rodzic
commit
58aa631ac8

+ 12 - 6
hdApp/src/admin/billing/affirmGhs.vue

@@ -290,6 +290,8 @@ export default {
 			//计算运费
 			//计算运费
 			this.calcFreight()
 			this.calcFreight()
 		}
 		}
+		//修改地址更新
+		this.getCurrentShop()
 	},
 	},
 	computed: {
 	computed: {
 		...mapGetters(["getMerchantInfo", "getLoginInfo","getDictionariesInfo"]),
 		...mapGetters(["getMerchantInfo", "getLoginInfo","getDictionariesInfo"]),
@@ -473,12 +475,7 @@ export default {
 			let that = this
 			let that = this
 			this.getDetailData()
 			this.getDetailData()
 
 
-			currentShop().then(res=>{
-				let that = this
-				if(res.code == 1){
-					that.shopInfo = res.data
-				}
-			})
+			this.getCurrentShop()
 
 
 			getWlList({id:this.option.id}).then(res=>{
 			getWlList({id:this.option.id}).then(res=>{
 				if(res.code == 1){
 				if(res.code == 1){
@@ -487,6 +484,15 @@ export default {
 			})
 			})
 
 
 		},
 		},
+		getCurrentShop(){
+			let that = this
+			currentShop().then(res=>{
+				let that = this
+				if(res.code == 1){
+					that.shopInfo = res.data
+				}
+			})
+		},
 		calcFreight() {
 		calcFreight() {
 			let weight = 0
 			let weight = 0
 			if(!this.$util.isEmpty(this.selectList)){
 			if(!this.$util.isEmpty(this.selectList)){

+ 12 - 6
hdApp/src/admin/billing/affirmGhsBook.vue

@@ -130,7 +130,7 @@
 					</tui-list-cell>
 					</tui-list-cell>
 
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
-						<view class="tui-title ">配送时间</view>
+						<view class="tui-title ">发货时间</view>
 						<picker mode="date" :value="sendTimeWant" @change="bindDateChange" style="width:400upx;">
 						<picker mode="date" :value="sendTimeWant" @change="bindDateChange" style="width:400upx;">
 							<view class="uni-input" v-if="sendTimeWant==''" style="color:#CCCCCC;">请选择日期</view>
 							<view class="uni-input" v-if="sendTimeWant==''" style="color:#CCCCCC;">请选择日期</view>
 							<view class="uni-input">{{sendTimeWant}}</view>
 							<view class="uni-input">{{sendTimeWant}}</view>
@@ -243,6 +243,8 @@ export default {
 			//计算运费
 			//计算运费
 			this.calcFreight()
 			this.calcFreight()
 		}
 		}
+		//修改地址更新
+		this.getCurrentShop()
 	},
 	},
 	computed: {
 	computed: {
 		...mapGetters(["getMerchantInfo", "getLoginInfo","getDictionariesInfo"]),
 		...mapGetters(["getMerchantInfo", "getLoginInfo","getDictionariesInfo"]),
@@ -299,11 +301,7 @@ export default {
 
 
 			this.getDetailData()
 			this.getDetailData()
 
 
-			currentShop().then(res=>{
-				if(res.code == 1){
-					that.shopInfo = res.data
-				}
-			})
+			this.getCurrentShop()
 
 
 			getWlList({id:this.option.id}).then(res=>{
 			getWlList({id:this.option.id}).then(res=>{
 				if(res.code == 1){
 				if(res.code == 1){
@@ -312,6 +310,14 @@ export default {
 			})
 			})
 
 
 		},
 		},
+		getCurrentShop(){
+			let that = this
+			currentShop().then(res=>{
+				if(res.code == 1){
+					that.shopInfo = res.data
+				}
+			})
+		},
 		calcFreight() {
 		calcFreight() {
 			let weight = 0
 			let weight = 0
 			if(!this.$util.isEmpty(this.selectList)){
 			if(!this.$util.isEmpty(this.selectList)){