lilei 2 年之前
父节点
当前提交
8d6fb06f65
共有 4 个文件被更改,包括 7 次插入7 次删除
  1. 2 2
      App.vue
  2. 1 1
      pages/digitalShelf/choosePartResult.vue
  3. 3 3
      pages/digitalShelf/orderDetail.vue
  4. 1 1
      pages/digitalShelf/orderList.vue

+ 2 - 2
App.vue

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

+ 1 - 1
pages/digitalShelf/choosePartResult.vue

@@ -10,7 +10,7 @@
 					</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" @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>
 						<!-- <button :hover-stop-propagation="true" @click="toSettle" v-if="state == 0" class="actionFail" size="mini">去结算</button> -->
 					</view>

+ 3 - 3
pages/digitalShelf/orderDetail.vue

@@ -18,7 +18,7 @@
 				</view>
 				<view>
 					<view>{{info.confirmQty}}</view>
-					<view>已扫码</view>
+					<view>已取货</view>
 				</view>
 			</view>
 		</view>
@@ -63,7 +63,7 @@
 						<view class="item-head">
 							<view>
 								数量:<text class="redText">{{item.totalQty}}</text>
-								已:<text>{{item.confirmQty}}</text>
+								已:<text>{{item.confirmQty}}</text>
 							</view>
 							<text class="item-no">{{item.shelfPlaceCode}}</text>
 						</view>
@@ -95,7 +95,7 @@
 		</view>
 		<view class="footer flex align_center justify_center" v-if="info">
 			<u-button v-if="info.billState != 'CLOSE'&&info.settleState=='WAIT'" :throttle-time="100" @click="deleteRow" shape="circle" type="info">取消订单</u-button>
-			<u-button v-if="info.billState == 'WAIT'" :throttle-time="100" @click="sanCodeRow" :custom-style="{background:'#066cff',color:'#fff'}" shape="circle" type="success">扫码取货</u-button>
+			<!-- <u-button v-if="info.billState == 'WAIT'" :throttle-time="100" @click="sanCodeRow" :custom-style="{background:'#066cff',color:'#fff'}" shape="circle" type="success">扫码取货</u-button> -->
 			<u-button v-if="info.billState == 'WAIT'" :throttle-time="100" @click="onceQh()" :loading="loading" :custom-style="{background:'#066cff',color:'#fff'}" shape="circle" type="success">一键取货</u-button>
 		</view>
 	</view>

+ 1 - 1
pages/digitalShelf/orderList.vue

@@ -42,7 +42,7 @@
 									 </view>
 									 <view style="text-align: right;">
 										 <button :hover-stop-propagation="true" @click.stop="deleteRow(item,index)" v-if="item.billState != 'CLOSE'&&item.settleState=='WAIT'" class="action del" size="mini">取消订单</button>
-										 <button :hover-stop-propagation="true" @click.stop="sanCodeRow(item)" v-if="item.billState == 'WAIT'" class="action finish" size="mini">扫码取货</button>
+										 <!-- <button :hover-stop-propagation="true" @click.stop="sanCodeRow(item)" v-if="item.billState == 'WAIT'" class="action finish" size="mini">扫码取货</button> -->
 										 <button :hover-stop-propagation="true" @click.stop="onceQh(item,index)" :loading="loading" v-if="item.billState == 'WAIT'" class="action finish" size="mini">一键取货</button>
 									 </view>
 								 </view>