Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -80,7 +80,7 @@
 					直接出库
 				</button>
 				<button class="admin-button-com middle" @click="confirmStockOutOrder">
-					确认
+					保存
 				</button>
 			</view>
 		</view>
@@ -245,26 +245,17 @@ export default {
 				// 验证通过!
 				if (!checkRes) {
 					let self = this;
-					uni.showModal({
-						title: '提示',
-						content: '确定出库？',
-						success: function (res) {
-							if (res.confirm) {
 								self.confirmStockOut(formData)
-							}
-						}
-					});
-
 				} else {
 					this.$msg(checkRes);
 				}
 			} catch (error) {}
 		},
 		async confirmStockOut(formData){
-			await createStockOutOrderApi(formData);
+			let { data } = await createStockOutOrderApi(formData);
 			this.$msg("确认成功");
 			this.clearSelectList();
-			uni.navigateTo({url:'/common/pageSuccess?title=出库成功'});
+			uni.navigateTo({url:'/pagesStorehouse/allot/exDetails?orderSn=' + data.orderSn});
 			// uni.navigateBack({delta: 1});
 		},
 	}

ghsApp/src/pagesStorehouse/stockWarn/manage.vue

@@ -1,7 +1,6 @@
 <template>
 	<view class="billing_box_bg">
-		<app-tabs :tabs="tabs" :currentTab="tabIndex" @change="change" itemWidth="50%"/>
-		<view class="input-wrap">
+    <view class="input-wrap">
 			<view v-if="loginInfo.super" class="city-select text-line">
 				<DorpdownSelect :menuObj.sync="menuObj" :selectItemId.sync="shopId" top="0" @selectSussess="selectSussess"></DorpdownSelect>
 			</view>
@@ -13,6 +12,7 @@
 				/>
 			</view>
 		</view>
+		<app-tabs :tabs="tabs" :currentTab="tabIndex" @change="change" itemWidth="50%"/>
 		<view v-if="tabs[tabIndex].name=='库存预警'" class="scroll-middle_bx">
 			<!--内容部分 start -->
 			<!--内容部分 start -->

hdApp/src/admin/billing/confirm.vue

@@ -22,7 +22,7 @@
 			<view class="code-title"> 扫码付款</view>
 			<view class="code-image">
 				<image
-					src="https://img.huaml.com/uploads/12358/202005/29/de74c55596d304b85e79154958e8bf57_small.jpeg"
+					:src="`${constant.url}/uploads/12358/202005/29/de74c55596d304b85e79154958e8bf57_small.jpeg`"
 					alt="商品图"
 				/>
 			</view>

hdApp/src/admin/home/workbench.vue

@@ -208,6 +208,11 @@ export default {
           img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`,
           url: "/pagesPurchase/shopping"
         },
+        {
+					name: "库存",
+					img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,
+					url: "/pagesStorehouse/stockWarn/manage"
+				},
         {
           name: "供应商",
           img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`,

hdApp/src/admin/recharge/renew.vue

@@ -17,7 +17,7 @@
       <view class="use">本次充值仅限在<text style="color: #666;padding: 0 10upx;font-weight: 700;">{{initData.merchantName}} {{initData.shopName}}</text>门店使用</view>
       <view class="use use_margin"><text style="color: #666;">{{initData.userNum}}</text> 人已充值</view>
       <view class="user_avator">
-        <image src="https://img.huaml.com/recharge/has_recharge.png"></image>
+        <image :src="`${constant.url}/recharge/has_recharge.png`"></image>
       </view>
     </div>
   </div>

hdApp/src/pagesStatistics/pagesPublicity.vue

@@ -9,12 +9,12 @@
       <view class="open_btn">打开聊天框</view>
       <view class="_title">点击框内右下方“开启微信提醒”卡片</view>
       <image
-        src="https://img.huaml.com/focus/send.png"
+        :src="`${constant.url}/focus/send.png`"
         class="img_1"
       />
       <view class="_title">点击框内右下方“开启微信提醒”卡片</view>
       <image
-        src="https://img.huaml.com/focus/qr_code.png"
+        :src="`${constant.url}/focus/qr_code.png`"
         class="img_1"
       />
     </view>

hdApp/src/pagesStorehouse/shop/list.vue

@@ -4,7 +4,7 @@
 			<view class="shop-item" v-for="(item, index) in shopList" :key="index">
 				<image
 					class="avatar"
-					src="https://img.huaml.com/uploads/12358/202005/29/de74c55596d304b85e79154958e8bf57_small.jpeg"
+					:src="`${constant.url}/uploads/12358/202005/29/de74c55596d304b85e79154958e8bf57_small.jpeg`"
 					alt="商品图"
 				/>
 				<view class="info">

hdApp/src/pagesStorehouse/stockWarn/manage.vue

@@ -1,7 +1,6 @@
 <template>
 	<view class="billing_box_bg">
-		<app-tabs :tabs="tabs" :currentTab="tabIndex" @change="change" itemWidth="50%"/>
-		<view class="input-wrap">
+    <view class="input-wrap">
 			<view v-if="loginInfo.switchShop" class="city-select text-line">
 				<DorpdownSelect :menuObj.sync="menuObj" :selectItemId.sync="shopId" top="0" @selectSussess="selectSussess"></DorpdownSelect>
 			</view>
@@ -13,6 +12,7 @@
 				/>
 			</view>
 		</view>
+		<app-tabs :tabs="tabs" :currentTab="tabIndex" @change="change" itemWidth="50%"/>
 		<view v-if="tabs[tabIndex].name=='库存预警'" class="scroll-middle_bx">
 			<!--内容部分 start -->
 			<!--内容部分 start -->

pt/src/saas/shop/manage.vue

@@ -142,6 +142,7 @@ export default {
 			this.$service.auth.shopAdminDelete(param).then(res => {
 				this.$message.success('操作成功！');
         this.$refs[`popover-` + item.id].doClose();
+        this.app.refresh()
 			});
 		},
 	}