lilei hace 3 años
padre
commit
403aa1e51e
Se han modificado 3 ficheros con 4 adiciones y 4 borrados
  1. 2 2
      App.vue
  2. 1 1
      pages/digitalShelf/choosePart.vue
  3. 1 1
      pages/digitalShelf/choosePartResult.vue

+ 2 - 2
App.vue

@@ -1,8 +1,8 @@
 <script>
 	export default {
 		globalData: {
-			// baseUrl: 'http://192.168.16.103:9110/saas/clz/', // 本地
-			baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
+			baseUrl: 'http://192.168.16.156:9110/saas/clz/', // 本地
+			// baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 		},
 		onLaunch: function() {

+ 1 - 1
pages/digitalShelf/choosePart.vue

@@ -509,7 +509,7 @@
 					}else{
 						// 或失败
 						uni.redirectTo({
-							url:"/pages/digitalShelf/choosePartResult?data="+encodeURIComponent(JSON.stringify({remindMessage:res.message}))+"&state=0"
+							url:"/pages/digitalShelf/choosePartResult?data="+encodeURIComponent(JSON.stringify({shelfOrder:{remindMessage:res.message}}))+"&state=0"
 						})
 					}
 					this.saveLoading = false

+ 1 - 1
pages/digitalShelf/choosePartResult.vue

@@ -8,7 +8,7 @@
 						</u-icon>
 						<text>{{statusText}}</text>
 					</view>
-					<view class="messageText" v-html="info&&info.remindMessage||''"></view>
+					<view class="messageText" v-html="info&&info.shelfOrder&&info.shelfOrder.remindMessage||''"></view>
 					<view class="button-group">
 						<button :hover-stop-propagation="true" @click="toScan" v-if="state == 1&&partList.length" class="back" size="mini">扫码取货</button>
 						<button :hover-stop-propagation="true" :loading="loading" @click="onceQh" v-if="state == 1&&partList.length" class="action" size="mini">一键取货</button>