显示优化

ghsApp/src/admin/billing/index.vue

@@ -65,7 +65,7 @@
 			</scroll-view>
 			<block v-else>
 				<view style="width:100%">
-					<AppWrapperEmpty title="敬请期待" :type="'billing'" :is-empty="true" />
+					<AppWrapperEmpty :type="'billing'" :is-empty="true" />
 				</view>
 			</block>
 		</view>
@@ -73,7 +73,7 @@
 		<modal-module :show="isModel" @cancel="modalCancel" @click="affirm" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
-					<view class="kc"> 库存{{ customData.stock }} </view>
+					<view class="kc"> 库存 {{ customData.stock }} </view>
 					<view class="num_bx">
 						<input v-model="customData.bigCount" type="number" />扎
 						<input v-model="customData.smallCount" type="number" style="margin-left:24upx" />支
@@ -122,10 +122,10 @@ export default {
 			tabIndex: 0,
 			tabs: [
 				{
-					name: "花材"
+					name: "批发"
 				},
 				{
-					name: "成品"
+					name: "零售"
 				}
 				// {
 				//     name: '课程'

ghsApp/src/admin/ghs/shop.vue

@@ -0,0 +1,72 @@
+<template>
+	<div class="app-content">
+		<view style="margin:100rpx;">供货商列表</view>
+	</div>
+</template>
+
+<script>
+	import TuiListCell from '@/components/plugin/list-cell'
+	import AppAvatarModule from '@/components/module/app-avatar'
+	import SimpleAddress from '@/components/plugin/simple-address'
+	import AppAreaSel from '@/components/app-area-sel'
+	const form = require('@/utils/formValidation.js')
+	// api
+    import { updateShop as update, addShop as add } from '@/api/shop'
+	export default {
+		name: 'ghs-shop',
+		components: {
+			TuiListCell,
+            AppAvatarModule,
+            SimpleAddress,
+            AppAreaSel
+		},
+		data() {
+			return {
+				
+			}
+		},
+		onLoad() {
+		},
+		onShow() {
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.app-content {
+		min-height: calc(100vh - 20px);
+		padding-top: 20px;
+	}
+	.prompt-text {
+		color: $fontColor3;
+		padding-left: 30px;
+		margin-bottom: 30px;
+	}
+	// ---
+	.module-com {
+		margin-bottom: 20px;
+		.member-wrap {
+			.member-det {
+				font-size: 24px;
+				margin-left: 20px;
+			}
+		}
+		.remark-wrap {
+			align-items: flex-start;
+			.remark {
+				height: 240px;
+			}
+		}
+	}
+	// 按钮
+	.confirm-btn {
+		width: calc(100% - 60px);
+		margin: 60px 30px 20px;
+		.admin-button-com {
+			width: 100%;
+		}
+	}
+</style>

ghsApp/src/admin/home/apply.vue

@@ -75,7 +75,12 @@
 	                            name: "员工业绩",
 	                            img: `${this.$constant.imgUrl}/ghs/home/kdyj.png`,
 	                            url: "/admin/staff/achieve"
-	                        }
+	                        },
+                            {
+                                name: "供货商",
+                                img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,
+                                url: "/admin/ghs/shop"
+                            },
                         ]
                     },
                     {

ghsApp/src/admin/home/workbench.vue

@@ -5,7 +5,7 @@
 			<div class="user-top">
 				<div class="app-size-28">今日概况</div>
 				<view class="open-bt_bx">
-					<button id="shareStore" open-type="share" class="admin-button-com">
+					<button @tap="getMyMall" class="admin-button-com">
 						<i class="iconfont iconfenxiang"></i>
 						我的商城
 					</button>
@@ -131,10 +131,10 @@ import FabModule from "@/components/plugin/fab";
 import AppAvatarModule from "@/components/module/app-avatar";
 import ModalModule from "@/components/plugin/modal";
 import { getDataTimestamp } from "@/utils/common";
-// api
+import { getWeixinId } from "@/api/invite/index";
 import { getUser } from "@/utils/auth";
 import { consoleIndex } from "@/api/workbench";
-// import {  share } from "@/mixins";
+
 export default {
 	name: "admin-workbench",
 	components: {
@@ -350,7 +350,24 @@ export default {
 				},
 				type: 2
 			});
-		}
+		},
+		getMyMall(){
+			getWeixinId().then(res => {
+				uni.navigateToMiniProgram({
+					appId: res.data.hd.miniAppId,
+					path: 'admin/ghs/shop',
+					//develop 开发板 trial 体验版 release 正式版
+					envVersion: 'develop',
+					extraData: {
+						'shopAdminId': this.loginInfo.shopAdminId
+					},
+					success(res) {
+						// 打开成功
+					}
+				})
+			});
+
+		},
 	}
 };
 </script>

ghsApp/src/components/app-wrapper-empty.vue

@@ -51,7 +51,7 @@ export default {
 		// 图片宽度
 		pictureWidth: {
 			type: String,
-			default: '200rpx'
+			default: '400rpx'
 		},
 
 		pictureHeight: {
@@ -61,7 +61,7 @@ export default {
 
 		title: {
 			type: String,
-			default: '暂无数据'
+			default: ''
 		},
 
 		// 是否垂直居中

ghsApp/src/components/module/app-commodity.vue

@@ -177,7 +177,7 @@ export default {
 					border-radius: 22px;
 					background-color: #f5f5f5;
 					padding: 3px 0;
-					font-size: 30rpx;
+					font-size: 25rpx;
 				}
 				.change-input {
 					width: 164px;

ghsApp/src/ext.json

@@ -4,7 +4,7 @@
   "directCommit": false,
   "ext": {
     "account": 0,
-    "apiHost": "http://api.shop.hzghd.com",
+    "apiHost": "https://api.shop.hzghd.com",
     "imgHost": "https://img.hzghd.com",
     "name":"花掌柜"
   }

ghsApp/src/pages.json

@@ -175,6 +175,12 @@
 				{"path": "me/rechargeSuccess","style": {"navigationBarTitleText": "充值成功"}}
 			]
 		},
+		{
+			"root": "admin/ghs",
+			"pages": [
+				{"path": "shop","style": {"navigationBarTitleText": "供货商"}}
+			]
+		},
 		{
 			"root": "admin/coupon",
 			"pages": [

ghsApp/src/pagesPurchase/components/CommodityPurchase.vue

@@ -153,7 +153,7 @@ export default {
 					border-radius: 22px;
 					background-color: #f5f5f5;
 					padding: 3px 0;
-					font-size: 30rpx;
+					font-size: 25rpx;
 				}
 				.change-input {
 					width: 164px;