修改商品入库界面，以及订单界面

pages/commissionedSales/receivedCommission/index.vue

@@ -74,10 +74,8 @@
 					已拒绝
 				</view>
 				<view class="contentgn">
-				<!-- 	<view class="contentgn_a" click="deleteOrder(item)">
-						删除
-					</view>
-					<span></span> -->
+				<!-- 
+				 -->
 					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>

pages/product/addGoods/index.vue

@@ -169,7 +169,7 @@
 					</checkbox-group>
 				</view>
 
-				<view v-if="setFormData.delivery_way.includes('2')" class="popup_group_item">
+				<!-- <view v-if="setFormData.delivery_way.includes('2')" class="popup_group_item">
 					<view class="popup_group_item_label">是否包邮</view>
 					<view class="popup_group_item_value">
 						<view class="popup_group_item_message">
@@ -177,7 +177,7 @@
 								style="transform:scale(0.8)" @change="deliveryFreeChange" disabled="true"/>
 						</view>
 					</view>
-				</view>
+				</view> -->
 
 				<view class="popup_group_item"
 					v-if="setFormData.delivery_way.includes('2') && setFormData.delivery_free == 0"

pages/supply_chains/supply_chains.vue

@@ -539,7 +539,7 @@
 				this.street_id = e.value[1].code
 				this.town = e.value[1].name
 				this.productList=[]
-				this.list(this.street_id)
+				this.list(true,this.street_id)
 			},
 			selfLocation() {
 				if (uni.getStorageSync('loction') == true) {

pages/trading_hall/adddiscounts/index.vue

@@ -373,14 +373,8 @@
 			getUserInfo: function() {
 				let that = this;
 				getUserInfo().then(res => {
-
-
-
 					this.merId = res.data.service.mer_id
-
 				})
-
-
 			},
 			// 是否包邮选择
 			deliveryFreeChange(val) {

pages/users/order_list/indexCopy.vue

@@ -680,11 +680,11 @@
 				 * 提示
 				 */
 				dePay() {
-					
+
 					uni.showModal({
 						title: '提示',
-					title: '该订单属于先货后款的订单，等商户确认后才能支付',
-						success: function (res) {
+						title: '该订单属于先货后款的订单，等商户确认后才能支付',
+						success: function(res) {
 							if (res.confirm) {
 								console.log('用户点击确定');
 							} else if (res.cancel) {
@@ -692,7 +692,7 @@
 							}
 						}
 					});
-					
+
 				},
 				/**
 				 * 点击去评价