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

ghs/src/admin/home/member.vue

@@ -8,24 +8,24 @@
       :height="100"
       @add="pageTo('/admin/member/add')"
       @change="change"
-      itemWidth="25%"
+      itemWidth="50%"
     />
     <!-- list -->
-    <view style="padding:0 8px 10px 8px;" v-if="showMoreUser">
+    <!-- <view style="padding:0 8px 10px 8px;" v-if="showMoreUser">
 
-<span class="user_tag">恋人(867)</span>
-<span class="user_tag">学生(50)</span>
-<span class="user_tag">准婚(150)</span>
-<span class="user_tag">同行(30)</span>
-<span class="user_tag">常买散花(837)</span>
-<span class="user_tag">企业客户(66)</span>
-<span class="user_tag">生日送过(43)</span>
-<span class="user_tag">酒店(28)</span>
-<span class="user_tag">影楼(10)</span>
-<span class="user_tag">开花艺课(42)</span>
-<span class="user_tag">学员(711)</span>
+      <span class="user_tag">恋人(867)</span>
+      <span class="user_tag">学生(50)</span>
+      <span class="user_tag">准婚(150)</span>
+      <span class="user_tag">同行(30)</span>
+      <span class="user_tag">常买散花(837)</span>
+      <span class="user_tag">企业客户(66)</span>
+      <span class="user_tag">生日送过(43)</span>
+      <span class="user_tag">酒店(28)</span>
+      <span class="user_tag">影楼(10)</span>
+      <span class="user_tag">开花艺课(42)</span>
+      <span class="user_tag">学员(711)</span>
 
-    </view>
+    </view> -->
     <block v-if="!$util.isEmpty(list.data)">
       <block v-for="(item,index) in list.data" :key="index">
         <tui-list-cell
@@ -38,14 +38,14 @@
 				})"
         >
           <div class="tui-msg-box">
-            <img :src="item.avatarUrl" class="tui-msg-pic" mode="widthFix" />
+            <img :src="item.avatar" class="tui-msg-pic" mode="widthFix" />
             <div class="tui-msg-item">
               <div class="tui-msg-name">
-                <div class="tui-user-name">{{item.userName}}</div>
+                <div class="tui-user-name">{{item.shopName}}</div>
                 <appVipModule
-                  v-if="item.member > 0"
+                  v-if="item.level > 0"
                   class="level-img"
-                  :vipImg="`${constant.imgUrl}/retail/member/grade/${item.userAsset.member}.png`"
+                  :vipImg="`${constant.imgUrl}/retail/member/grade/${item.level}.png`"
                 />
                 <template v-else>
                   <appVipModule
@@ -62,7 +62,7 @@
                 </template>
               </div>
               <div class="tui-msg-content">
-                <span>{{item.visitTimeFormat}}</span>
+                <span>{{item.visitTime}}</span>
               </div>
             </div>
           </div>
@@ -105,23 +105,14 @@ export default {
   data() {
     return {
       tabIndex: 0,
-      showMoreUser:false,
       tabs: [
         {
           name: "全部",
           value: 0
         },
         {
-          name: "粉丝",
+          name: "已开店",
           value: 0
-        },
-        {
-          name: "会员",
-          value: 0
-        },
-        {
-          name: "更多",
-          value: "..."
         }
       ]
     };
@@ -160,9 +151,8 @@ export default {
       }).then(res => {
         this.completes(res);
         if (this.$util.isEmpty(res.data)) return false;
-        this.tabs[0].value = res.data.asset.totalUser;
-        this.tabs[1].value = res.data.asset.totalFans;
-        this.tabs[2].value = res.data.asset.totalMember;
+        this.tabs[0].value = res.data.allNum;
+        this.tabs[1].value = res.data.isOpenNum;
       });
     },
     change(e) {
@@ -170,10 +160,10 @@ export default {
         return false;
       } else {
         if(e.index == 3){
-          this.showMoreUser = true;
+          // this.showMoreUser = true;
           this.tabIndex = e.index;
         }else{
-          this.showMoreUser = false;
+          // this.showMoreUser = false;
           this.tabIndex = e.index;
           this.resetList();
           this._list();

ghs/src/admin/home/workbench.vue

@@ -26,11 +26,11 @@
         </div>
         <div class="info-list">
           <div class="info-list-name">新客户</div>
-          <div class="info-list-value">{{ $util.numberFormat(data.todayData.fans) || 0 }}</div>
+          <div class="info-list-value">{{ $util.numberFormat(data.todayData.user) || 0 }}</div>
         </div>
         <div class="info-list">
           <div class="info-list-name">支出</div>
-          <div class="info-list-value">{{ $util.numberFormat(data.todayData.user) || 0 }}</div>
+          <div class="info-list-value">{{ $util.numberFormat(data.todayData.expend) || 0 }}</div>
         </div>
       </div>
     </div>
@@ -66,17 +66,25 @@
         </div>
       </div>
     </div>
+     
     <!-- 客户按钮 -->
-    <div class="module-com tabs-wrap">
-      <div class="tabs-list" v-for="(item, index) in tabsData" :key="index">
-        <div @click="goToItem(item)">
-          <div class="tabs-img">
-            <img :src="item.img" alt mode="widthFix" />
+    <view class="module-com">
+       <view class="tabs-head_bx">
+          <image @click="pageTo({url:'/admin/billing/index'})" :src="cgSrc" mode="widthFix"></image>
+          <image @click="pageTo({url:'/admin/billing/index'})" :src="kdSrc" mode="widthFix"></image>
+       </view>
+        <div class="tabs-wrap">
+          <div class="tabs-list" v-for="(item, index) in tabsData" :key="index">
+            <div @click="pageTo(item)">
+              <div class="tabs-img">
+                <img :src="item.img" alt mode="widthFix" />
+              </div>
+              <div class="tabs-name">{{ item.name }}</div>
+            </div>
           </div>
-          <div class="tabs-name">{{ item.name }}</div>
         </div>
-      </div>
-    </div>
+    </view>
+    
     <!-- 总览 -->
     <div class="module-com total-wrap">
       <div class="total-tit">总览</div>
@@ -195,22 +203,62 @@ export default {
         // },
         {
           name: "库存预警",
-          img: `${this.$constant.imgUrl}/ghs/home/mds.png`,
+          img: `${this.$constant.imgUrl}/ghs/home/kcyj.png`,
+          url: "/admin/staff/list"
+        },
+        {
+          name: "改价",
+          img: `${this.$constant.imgUrl}/ghs/home/gj.png`,
+          url: "/admin/staff/list"
+        },
+        {
+          name: "调拨出库",
+          img: `${this.$constant.imgUrl}/ghs/home/dbck.png`,
+          url: "/admin/staff/list"
+        },
+        {
+          name: "调拨入库",
+          img: `${this.$constant.imgUrl}/ghs/home/dbrk.png`,
+          url: "/admin/staff/list"
+        },
+        {
+          name: "花材管理",
+          img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,
+          url: "/admin/staff/list"
+        },
+        {
+          name: "客户欠款",
+          img: `${this.$constant.imgUrl}/ghs/home/khqk.png`,
           url: "/admin/staff/list"
         },
         {
           name: "员工",
-          img: `${this.$constant.imgUrl}/retail/admin/tab-icon-6.png`,
+          img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,
           url: "/admin/staff/list"
         },
         {
           name: "门店",
-          img: `${this.$constant.imgUrl}/retail/admin/tab-icon-6.png`,
+          img: `${this.$constant.imgUrl}/ghs/home/shop.png`,
           url: "/admin/shop/list"
         },
         {
           name: "邀请开店",
-          img: `${this.$constant.imgUrl}/retail/admin/tab-icon-511.png`,
+          img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,
+          url: "/admin/interest/my-invite"
+        },
+        {
+          name: "邀请开店",
+          img: `${this.$constant.imgUrl}/ghs/home/khlb.png`,
+          url: "/admin/interest/my-invite"
+        },
+        {
+          name: "邀请开店",
+          img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,
+          url: "/admin/interest/my-invite"
+        },
+        {
+          name: "全部",
+          img: `${this.$constant.imgUrl}/ghs/home/qball.png`,
           url: "/admin/interest/my-invite"
         },
         // {
@@ -227,30 +275,32 @@ export default {
       // 总览
       totalData: [
         {
-          name: "会员数",
+          name: "客户数",
           value: 0
         },
-        {
-          name: "粉丝数",
+          {
+          name: "会员数",
           value: 0
         },
-        {
-          name: "客户数",
+         {
+          name: "总访问量",
           value: 0
         },
         {
           name: "总收入（元）",
           value: 0
         },
-        {
-          name: "总访问量",
+       {
+          name: "总支出（元）",
           value: 0
         },
         {
-          name: "剩余短信",
+          name: "短信数",
           value: 0
         }
-      ]
+      ],
+      cgSrc:`${this.$constant.imgUrl}/ghs/home/cg.png`,
+      kdSrc:`${this.$constant.imgUrl}/ghs/home/kd.png`
     };
   },
   computed: {
@@ -283,21 +333,18 @@ export default {
       });
       consoleIndex().then(res => {
         this.data = res.data;
-        const { asset } = res.data;
+        const { asset, todayData} = res.data;
         if (!this.$util.isEmpty(asset)) {
           // 订单总览
-          this.orderData[0].value = asset.unPayOrder;
-          this.orderData[1].value = asset.unSendOrder;
-          this.orderData[2].value = asset.sendingOrder;
-          this.orderData[3].value = asset.unNoticeOrder;
-          this.orderData[4].value = asset.finishOrder;
-          this.orderData[5].value = asset.totalOrder;
+          this.orderData[0].value = asset.unSendOrder;
+          this.orderData[1].value = asset.sendingOrder;
+          this.orderData[2].value = todayData.order;
           // 总览数据
-          this.totalData[0].value = asset.totalMember;
-          this.totalData[1].value = asset.totalFans;
-          this.totalData[2].value = asset.totalUser;
+          this.totalData[0].value = asset.totalUser;
+          this.totalData[1].value = asset.totalMember;
+          this.totalData[2].value = asset.totalVisit;
           this.totalData[3].value = asset.totalIncome;
-          this.totalData[4].value = asset.totalVisit;
+          this.totalData[4].value = asset.totalExpend;
           this.totalData[5].value = asset.remainSmsNum;
         }
       });
@@ -320,9 +367,9 @@ export default {
         type: 2
       });
     },
-    goToItem(item) {
-      this.$util.pageTo(item);
-    }
+    // goToItem(item) {
+    //   this.$util.pageTo(item);
+    // }
   }
 };
 </script>
@@ -454,6 +501,11 @@ export default {
     }
   }
 }
+.tabs-head_bx {
+  display: flex;
+  align-items: center;
+  padding: 20px 15px;
+}
 // tabs
 .tabs-wrap {
   padding: 40px 10px;

ghs/src/admin/member/add.vue

@@ -3,38 +3,56 @@
 		<form @submit="formSubmit">
 			<div class="module-com input-line-wrap">
 				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title required">手机号</div>
-					<input v-model="form.mobile" placeholder-class="phcolor" class="tui-input" name="mobile" placeholder="请输入" maxlength="50" type="number" />
+					<div class="tui-title required">花店名称</div>
+					<input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请输入" maxlength="50" type="text" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title required">确认手机号</div>
-					<input v-model="form.confirmMobile" placeholder-class="phcolor" class="tui-input" name="confirmMobile" placeholder="请输入" maxlength="50" type="number" />
+					<div class="tui-title required">店长姓名</div>
+					<input v-model="form.adminName" placeholder-class="phcolor" class="tui-input" name="adminName" placeholder="请输入" maxlength="50" type="text" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title required">余额</div>
-					<input v-model="form.balance" placeholder-class="phcolor" class="tui-input" name="balance" placeholder="请输入" maxlength="50" type="number" />
-				</tui-list-cell>
-				<tui-list-cell class="line-cell" :arrow="true">
-					<div class="tui-title required">会员级别</div>
-					<picker mode="selector" :value="form.memberLevel" :range="levelData.list" range-key="level" @change="changeLevelFn" class="tui-input">
-						<input v-model="form.memberLevel" name="memberLevel" type="text" hidden />
-						<div v-if="form.memberLevel">{{ levelSelData.level }}</div>
-						<div class="tui-placeholder" v-else>请选择</div>
-					</picker>
+					<div class="tui-title required">店长手机号</div>
+					<input v-model="form.mobile" placeholder-class="phcolor" class="tui-input" name="mobile" placeholder="请输入" maxlength="50" type="number" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title">姓名</div>
-					<input v-model="form.realName" placeholder-class="phcolor" class="tui-input" name="phone" placeholder="请输入（选填）" maxlength="50" type="text" />
+					<div class="tui-title required">确认手机号</div>
+					<input v-model="form.confirmMobile" placeholder-class="phcolor" class="tui-input" name="confirmMobile" placeholder="请输入" maxlength="50" type="number" />
 				</tui-list-cell>
-				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title required">确认密码</div>
-					<input v-model="form.confirmPassword" placeholder-class="phcolor" class="tui-input" name="confirmPassword" placeholder="请输入确认密码" maxlength="50" type="password" />
+				<view class="line-hint_bx">
+					以下选填
+				</view>
+				<tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="openAddres">
+					<div class="tui-title">所在城市</div>
+					<div class="tui-input" v-if="form.province">{{ form.province + '-' + form.city }}</div>
+					<div class="tui-placeholder" v-else>请选择</div>
 				</tui-list-cell>
-				<div class="prompt-text">注册会员时会根据手机号识别此客户，等级和余额自动同步到帐户里。</div>
-				<div class="btn-wrap">
+				 <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="selRegionFn">
+					<div class="tui-title">详细地址</div>
+					<div class="tui-input" v-if="form.address">{{ form.address }}</div>
+					<div class="tui-placeholder" v-else>请填写详细地址</div>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
+					<div class="tui-title">门牌号</div>
+					<input
+						v-model="form.floor"
+						placeholder-class="phcolor"
+						placeholder-style="color:#CCCCCC"
+						class="tui-input"
+						placeholder="楼号门牌号（选填）"
+					/>
+					</tui-list-cell>
+					<div class="btn-wrap">
 					<button class="admin-button-com blue big" formType="submit">确认</button>
-				</div>
+				</div>		
 			</div>
+			<!-- 选择地区 -->
+			<app-area-sel :show.sync="showRegion" @change="changeAreaFn" :city="form.city" />
+			<!-- 省市联动 -->
+			<simple-address
+				ref="simpleAddress"
+				:pickerValueDefault="cityPickerValueDefault"
+				@onConfirm="onCityConfirm"
+			></simple-address>
 		</form>
 	</div>
 </template>
@@ -46,33 +64,72 @@ const form = require('@/utils/formValidation.js')
 // api
 import { getLevel } from '@/utils/config'
 import { add } from '@/api/member'
+// import {
+//   regionTree
+// } from "@/api/official";
+import AppAreaSel from "@/components/app-area-sel";
+import SimpleAddress from "@/components/plugin/simple-address";
 export default {
 	name: 'member-add',
 	components: {
-		TuiListCell
+		TuiListCell,
+		AppAreaSel,
+        SimpleAddress,
 	},
 	data() {
 		return {
+			showRegion:false,
+			 // 省市联动
+			regionData: [],
+			cityPickerValueDefault: [0, 0],
 			form: {
+				floor:'',
+				address:'',
+				province:'',
+				city:'',
 				mobile: '',
 				confirmMobile: '',
-				balance: 0,
-				memberLevel: '',
-				realName: '',
-				confirmPassword: ''
+				name: '',
+				adminName: '',
+				lat:'',
+				long: ''
 			},
 			levelSelData: {}
 		}
 	},
 	computed: {
-		...mapGetters({ levelData: 'getLevel' })
 	},
 	onLoad() {
-		getLevel()
 	},
 	methods: {
+		init(){
+		},
+		onCityConfirm(e) {
+		this.form.province = e.provinceName;
+		this.form.city = e.cityName;
+		},
+		changeAreaFn(e) {
+		console.log("changeAreaFn", e);
+		this.form.address = e.address;
+		this.form.lat = e.location.lat;
+		this.form.long = e.location.lng;
+		},
+		selRegionFn(){
+			if (!this.form.city) {
+				this.$msg("请先选择城市！");
+				return false;
+			}
+			this.showRegion = true;
+		},
+		openAddres(){
+			this.$refs.simpleAddress.open();
+		},
 		confirmFn() {
-			add(this.form).then(res => {
+			add({
+				...this.form,
+				mobile: +this.form.mobile,
+				confirmMobile: +this.form.confirmMobile
+			}).then(res => {
 				this.$msg('添加成功！')
 				setTimeout(() => {
 					this.$util.pageTo(1)
@@ -88,30 +145,25 @@ export default {
 			// 表单规则
 			let rules = [
 				{
-					name: 'mobile',
-					rule: ['required'],
-					msg: ['请输入手机号']
-				},
-				{
-					name: 'confirmMobile',
+					name: 'name',
 					rule: ['required'],
-					msg: ['请输入手机号']
+					msg: ['请输入花店名称']
 				},
 				{
-					name: 'balance',
+					name: 'adminName',
 					rule: ['required'],
-					msg: ['请输入余额']
+					msg: ['请输入店长名称']
 				},
 				{
-					name: 'memberLevel',
+					name: 'mobile',
 					rule: ['required'],
-					msg: ['请选择会员级别']
+					msg: ['请输入手机号']
 				},
 				{
-					name: 'confirmPassword',
+					name: 'confirmMobile',
 					rule: ['required'],
-					msg: ['请输入密码']
-				}
+					msg: ['请输入确认手机号']
+				},	
 			]
 			// 进行表单检查
 			let formData = e.detail.value
@@ -128,4 +180,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+	.line-hint_bx {
+		color: #999999;
+		font-size: 24px;
+		font-weight: 400;
+		line-height: 70px;
+		padding-left: 31px;
+	}
 </style>

ghs/src/admin/official/apply.vue

@@ -79,7 +79,6 @@
       <!-- 省市联动 -->
       <simple-address
         ref="simpleAddress"
-        :region="regionData"
         :pickerValueDefault="cityPickerValueDefault"
         @onConfirm="onCityConfirm"
       ></simple-address>
@@ -145,22 +144,21 @@ export default {
   },
   methods: {
     init() {
-   
       this.$util.getCheckLogin().then(res => {
         if (res) {
           let id = uni.getStorageSync("introMerchantId");
           if (id > 0) {
             this._getMerchantDet();
           }
-          this._regionTree();
+          // this._regionTree();
         }
       });
     },
-    _regionTree() {
-      regionTree().then(res => {
-        this.regionData = res.data.tree;
-      });
-    },
+    // _regionTree() {
+    //   regionTree().then(res => {
+    //     this.regionData = res.data.tree;
+    //   });
+    // },
     _getMerchantDet() {
       let id = uni.getStorageSync("introMerchantId");
       getIntroduce({ id: id }).then(res => {

ghs/src/admin/shop/add.vue

@@ -48,7 +48,7 @@
 			</div>
 		</form>
 		<!-- 省市联动 -->
-		<simple-address ref="simpleAddress" :region="regionData" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onCityConfirm"></simple-address>
+		<simple-address ref="simpleAddress" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onCityConfirm"></simple-address>
 		<!-- 选择地区 -->
 		<app-area-sel :show.sync="showRegion" :city="form.receiveCity" @change="changeAreaFn" />
 	</div>
@@ -62,7 +62,6 @@
 	const form = require('@/utils/formValidation.js')
 	// api
     import { updateShop as update, addShop as add } from '@/api/shop'
-    import { regionTree } from '@/api/official'
 	export default {
 		name: 'staff-add',
 		components: {
@@ -111,12 +110,6 @@
 		methods: {
 			init() {
                 this._getDet()
-                this._regionTree()
-			},
-			_regionTree() {
-				regionTree().then(res => {
-					this.regionData = res.data.tree
-				})
 			},
 			// api
 			_getDet() {

ghs/src/api/member/index.js

@@ -4,7 +4,7 @@ import https from '@/plugins/luch-request_0.0.7/request'
  * 客户列表 b
  */
 export const getList = data => {
-	return https.get('/user/list', data)
+	return https.get('/custom/list', data)
 }
 
 /** *
@@ -25,7 +25,7 @@ export const getDet = data => {
  * 添加客户 b
  */
 export const add = data => {
-	return https.post('/user/add', data)
+	return https.post('/custom/add', data)
 }
 
 /** *

ghs/src/components/plugin/simple-address.vue

@@ -56,6 +56,9 @@
 // import provinceData from './city-data/province.js'
 // import cityData from './city-data/city.js'
 // import areaData from './city-data/area.js'
+import {
+  regionTree
+} from "@/api/official";
 export default {
 	name: 'simpleAddress',
 	props: {
@@ -91,13 +94,13 @@ export default {
 				return [0, 0]
 			}
 		},
-		// 省市区数据
-		region: {
-			type: Array,
-			default() {
-				return []
-			}
-		}
+		// // 省市区数据
+		// region: {
+		// 	type: Array,
+		// 	default() {
+		// 		return []
+		// 	}
+		// }
 	},
 	data() {
 		return {
@@ -106,7 +109,8 @@ export default {
 			pickerValue: [0, 0],
 			provinceDataList: [],
 			cityDataList: [],
-			areaDataList: []
+			areaDataList: [],
+			region: []
 		}
 	},
 	watch: {
@@ -125,7 +129,13 @@ export default {
 		this.sInit()
 	},
 	methods: {
+		_regionTree() {
+			regionTree().then(res => {
+				this.region = res.data.tree;
+			});
+		},
 		sInit() {
+			this._regionTree()
 		// 	this.handPickValueDefault() // 对 pickerValueDefault 做兼容处理
 		// 	this.provinceDataList = JSON.parse(JSON.stringify(this.region))
 		// 	this.cityDataList = []