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

ghsApp/src/admin/staff/list.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="app-content">
-		<app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" @change="change" itemWidth="33.33%" />
+		<app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" @change="change" itemWidth="50%" />
 		<!-- 员工列表 -->
 		<block v-if="tabIndex == 0">
 			<!-- 列表 -->
@@ -154,9 +154,6 @@ export default {
 				},
 				{
 					name: '角色管理'
-				},
-				{
-					name: '操作记录'
 				}
 			],
 			// 删除弹窗操作

ghsApp/src/pagesClient/member/detail.vue

@@ -25,11 +25,10 @@
                 @click="pageTo(item)"
               >
                 <view class="app-color-3">{{ item.name }}</view>
-                <view :class="['list-num',index===0?'color-blue':'']">{{ item.value }}</view>
+                <view class="list-num">{{ item.value }}</view>
               </view>
           </view>
         </view>
-            <!-- iconfont iconweixinlaiyuan _i  -->
       </view>
       <view class="module-com user-address_bx">
           <view class="address-tit">
@@ -39,15 +38,12 @@
             <view>
                 <view>
                   {{userInfo.name}} {{userInfo.mobile}}
-
-                  <!-- <i class="iconfont iconweixinlaiyuan _i"></i> -->
                 </view>
                 <view>
                   {{userInfo.address}}
                 </view>
             </view>
             <view>
-              
               <i @click="callUp" class="iconfont icondianhua1"></i>
             </view>
           </view>
@@ -74,26 +70,17 @@
 
 <script>
 import { mapGetters } from "vuex";
-// import AppVipModule from "@/components/module/app-vip";
 import AppAvatarModule from "@/components/module/app-avatar";
-// import ModalModule from "@/components/plugin/modal";
 import TuiListCell from '@/components/plugin/list-cell'
 import { share } from "@/mixins";
 import {
   getUserDet,
   debt
-  // remarkAdd,
-  // remarkDel,
-  // upgrade,
-  // rechargeB,
-  // resetPassword
 } from "@/api/member";
 export default {
   name: "member-detail",
   components: {
-    // AppVipModule,
     AppAvatarModule,
-    // ModalModule,
     TuiListCell
   },
   mixins: [share],
@@ -108,58 +95,31 @@ export default {
       // 订单总览
       orderData: [
         {
-          name: "欠款",
-          value: 0,
+          name: "欠款金额",
+          value: '0.00',
           url: "",
           type: 4,
-          query: {
-     
-          }
+          query: {}
         },
         {
           name: "消费次数",
-          value: 0,
+          value: '0',
           url: "",
           type: 4,
-          query: {
-           
-          }
+          query: {}
         },
         {
           name: "消费金额",
           url: "/admin/home/order",
           type: 4,
-          query: {
-          
-          },
-          value: 0
+          query: {},
+          value: '0.00'
         }
       ],
     };
   },
-  computed: {
-    // ...mapGetters({ levelData: "getLevel" })
-  },
+  computed: {},
   onLoad() {},
-  onShareAppMessage(res) {
-		if (res.target.id === "0") {
-			return  {
-          title: "更懂您的花卉宝",
-          desc: "",
-          imgUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
-          path: "pagesClient/official/index?introMerchantId=" + this.userInfo.id
-        }
-		} else if (res.target.id === "1") {
-			return {
-				title: "关联微信",
-				desc: "",
-				imgUrl: "",
-				path: "pagesClient/member/bind"
-			};
-		} else {
-			return {};
-		}
-	},
   methods: {
     async remindChangeFn(e){
       this.form.debt = e.detail.value ? 1 : 0;
@@ -178,7 +138,7 @@ export default {
     },
     callUp() {
       uni.makePhoneCall({
-        phoneNumber: this.userInfo.mobile //仅为示例
+        phoneNumber: this.userInfo.mobile
       });
     },
     init() {
@@ -191,16 +151,8 @@ export default {
         this.orderData[0].value = this.userInfo.debtAmount
         this.orderData[1].value = this.userInfo.buyNum
         this.orderData[2].value = this.userInfo.buyAmount
-        // let params = {
-        //   title: "更懂您的花卉宝",
-        //   desc: "",
-        //   imgUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
-        //   pagePath: "pagesClient/official/index?introMerchantId=" + res.data.id
-        // };
-        // this.jweixinFn(params);
       });
     },
-    // operate ===========================
     orderMoreFn() {
       this.orderMoreStatus = false;
     },
@@ -211,8 +163,6 @@ export default {
 </script>
 
 <style lang='scss' scoped>
-.app-content {
-}
 // 公共
 .module-com {
   margin: 0 30px 20px;

ghsApp/src/pagesClient/official/index.vue

@@ -53,6 +53,7 @@ export default {
   components: {
     AppSwiper,
   },
+  mixins: [share],
   data() {
     return {
       constant: this.$constant,
@@ -115,6 +116,17 @@ export default {
   computed: {
 		...mapGetters(["getLoginInfo"])
 	},
+  onLoad() {
+    this.jweixinFn({
+      title: "更懂您的花卉宝",
+      pagePath: "pagesClient/official/index",
+      imageUrl: ""
+    });
+  },
+  onShow() {
+    // 隐藏返回首页按钮。
+    uni.hideHomeButton()
+  },
   methods: {
 			...mapActions(['setUserShopAll']),
 			register(){

hd/dist/shop/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.79984156.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.79984156.js"></script></body></html>
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.ca6140ca.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.ca6140ca.js"></script></body></html>

hd/src/views/goods/goods-add.vue

@@ -6,7 +6,7 @@
 					<el-input v-model="ruleForm.goodsName" placeholder="请填写商品名称"></el-input>
 				</el-form-item>
 				<el-form-item label="历史销量" prop="sold">
-					<el-input v-model="ruleForm.sold" placeholder="商城上的销量 = 历史销量 + 实际销量"></el-input>
+					<el-input v-model="ruleForm.sold" placeholder="商城显示的销量 = 历史销量 + 实际销量"></el-input>
 				</el-form-item>
 				<el-form-item label="库存" prop="stock">
 					<el-input v-model="ruleForm.stock" placeholder="请填写库存，留空表示库存充足"></el-input>
@@ -104,7 +104,7 @@
 					</el-radio-group>
 				</el-form-item>
 
-				<el-form-item label="运费">
+				<el-form-item v-if="ruleForm.needSend == 0" label="运费">
 					<el-radio-group v-model="ruleForm.freightType">
 						<el-radio label="0">
 							<span>按距离收费</span>

hd/src/views/staff/list.vue

@@ -349,7 +349,7 @@ export default {
 							prop: 'id',
 							label: 'id',
 							align: 'center',
-							width: 60
+							width: 100
 						},
 						{
 							prop: 'avatar',
@@ -357,7 +357,7 @@ export default {
 							align: 'center',
 							width: 90,
 							formatter: row => {
-								return row.adminBaseInfo.avatarUrl;
+								return row.avatar;
 							}
 						},
 						{
@@ -365,7 +365,7 @@ export default {
 							label: '姓名',
 							align: 'center',
 							formatter: row => {
-								return row.adminBaseInfo.name;
+								return row.name;
 							}
 						},
 						{
@@ -373,44 +373,33 @@ export default {
 							label: '手机号',
 							align: 'center',
 							formatter: row => {
-								return row.adminBaseInfo.mobile;
+								return row.mobile;
 							}
 						},
 						{
 							prop: 'roleName',
 							label: '角色',
-							align: 'center'
-						},
-						{
-							prop: 'userId',
-							label: '绑定小程序',
 							align: 'center',
-							'min-width': 80
+							width: 100,
 						},
 						{
 							prop: 'incomeNotice',
 							label: '收款通知',
 							align: 'center'
 						},
+						{
+							prop: 'status',
+							label: '启用状态',
+							align: 'center'
+						},
 						{
 							prop: 'addDate',
 							label: '添加时间',
 							align: 'center'
 						},
 						{
-							prop: 'lastLoginTime',
+							prop: 'lastLogin',
 							label: '最后登录',
-							align: 'center',
-							formatter: row => {
-								if (row.loginTime == '0') {
-									return '-';
-								}
-								return row.lastLoginTime;
-							}
-						},
-						{
-							prop: 'status',
-							label: '启用状态',
 							align: 'center'
 						}
 					],

hdApp/src/admin/order/detail.vue

@@ -7,7 +7,6 @@
       <div class="page-top-det">
         <div>
           <div class="page-status">{{ data.status | constantfilter('ORDER_STATUS') }}</div>
-          <!-- <div class="page-prompt">请尽快支付哟~</div> -->
         </div>
         <div class="page-status-img">
           <img :src="data.status == 0 ? waitPayImg : waitDeliveryImg" mode="widthFix" />
@@ -52,7 +51,8 @@
           <div class="order-msg-blo">
             <div class="msg-list">
               <div class="label">送达时间</div>
-              <div class="value">{{ data.reachDate || '暂无' }}</div>
+              <div v-if="data.reachDate == '0000-00-00'" class="value">-</div>
+              <div v-else class="value"><span style="margin-right:10rpx;">{{data.reachDate}}</span> <span v-if="data.reachPeriod == 0">上午</span><span v-else-if="data.reachPeriod == 1">下午</span><span v-else>晚上</span></div>
             </div>
             <div class="msg-list">
               <div class="label">贺卡</div>
@@ -60,10 +60,10 @@
             </div>
             <div class="msg-list">
               <div class="label">祝福语</div>
-              <div class="value">{{ data.cardInfo || '暂无' }}</div>
+              <div class="value">{{ data.cardInfo || '-' }}</div>
             </div>
           </div>
-          <div class="order-msg-blo">
+          <div class="order-msg-blo" v-if="1 ==2">
             <div class="msg-list">
               <div class="label">客户评分</div>
               <div class="value">
@@ -72,7 +72,7 @@
             </div>
             <div class="msg-list">
               <div class="label">客户留言</div>
-              <div class="value">{{ data.evaluate || '暂无' }}</div>
+              <div class="value">{{ data.evaluate || '-' }}</div>
             </div>
           </div>
           <!--  -->
@@ -82,8 +82,8 @@
               <div class="value">{{ data.orderSn }}</div>
             </div>
             <div class="msg-list">
-              <div class="label">时间</div>
-              <div class="value">{{ data.addTime | formatTime }}</div>
+              <div class="label">生成时间</div>
+              <div class="value">{{ data.addTime}}</div>
             </div>
             <div class="msg-list">
               <div class="label">总价</div>

hdApp/src/admin/staff/list.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="app-content">
-		<app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" @change="change" itemWidth="33.33%" />
+		<app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" @change="change" itemWidth="50%" />
 		<!-- 员工列表 -->
 		<block v-if="tabIndex == 0">
 			<!-- 列表 -->
@@ -152,9 +152,6 @@ export default {
 				},
 				{
 					name: '角色管理'
-				},
-				{
-					name: '操作记录'
 				}
 			],
 			// 删除弹窗操作

hdApp/src/pagesClient/official/index.vue

@@ -220,7 +220,7 @@ export default {
 }
 .app-content {
   background-color: #fff;
-  padding-bottom: 100px;
+  padding-bottom: 130px;
 }
 .tab-wrap {
   @include disFlex(center, space-between);

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -2,12 +2,20 @@
 <template>
 	<view class="billing_box_bg">
 <!--		<app-tabs :tabs="tabs" :currentTab="tabIndex" @change="change" itemWidth="33.3%" />-->
+    <view class="c_header">
+      <view class="header_inside">
+        <image :src="pageInfo.avatar"></image>
+        <view class="shop_info">
+          <view class="shop_title">{{pageInfo.name}}</view>
+          <view class="shop_intro"><text style="margin-right: 20upx;">已采购：{{pageInfo.expendAmount}}</text> <text>欠款：{{pageInfo.debtAmount}}</text></view>
+        </view>
+        <i class="iconfont icondianhua1" @tap="toPhone(pageInfo.mobile)"></i>
+      </view>
+    </view>
 		<view class="input-wrap" >
 			<app-search-module v-model="py" placeholder="请输入关键词，支持拼音首字母搜索" @search="searchFn" />
 		</view>
 		<view class="scroll-middle_bx">
-
-
 			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop" >
 				<div v-for="(item, index) in filterProductInfo" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass">
 					<text>{{ item.className || "" }}</text>
@@ -116,6 +124,7 @@ import allMoreSelectInputMins from "@/mixins/allMoreSelectInput";
 import {mapActions, mapGetters} from "vuex";
 import { COMMODITY_TYPE } from "@/utils/declare";
 import productMins from "@/mixins/product";
+import { getGhsDataApi, ghsInfo } from "@/api/ghs/index";
 import { getShop } from '@/api/common/index'
 // import suitProductMins from "@/mixins/ghsProduct";
 export default {
@@ -180,13 +189,21 @@ export default {
 		}
 	},
   onShow() {
-    getShop({shopId: this.options.shopId}).then(res => {
-      console.log('179 res ===>', res)
-      this.pageInfo = res.data.info
-      uni.setNavigationBarTitle({
-        title: this.pageInfo.shopName
-      })
-    }).catch(err => {})
+    if(this.option.id == 0) {
+      ghsInfo({shopId: this.option.shopId}).then(res => {
+        this.pageInfo = res.data
+        uni.setNavigationBarTitle({
+          title: this.pageInfo.name
+        })
+      }).catch(err => {})
+    } else {
+      getGhsDataApi({id: this.option.id}).then(res => {
+        this.pageInfo = res.data
+        uni.setNavigationBarTitle({
+          title: this.pageInfo.name
+        })
+      }).catch(err => {})
+    }
   },
 
 	methods: {
@@ -198,6 +215,12 @@ export default {
 				this.initAllInput();
 			})
 		},
+    // 拨打电话  wangn  2021-5-6
+    toPhone(phone){
+			uni.makePhoneCall({
+				phoneNumber: phone //仅为示例
+			});
+		},
 		modalCancel() {
 			this.isModel = false;
 			this.customData = {};
@@ -287,6 +310,57 @@ export default {
 	height: 100%;
 	display: flex;
 	flex-direction: column;
+  .c_header{
+    height: 240upx;
+    width: 100vw;
+    padding: 0 15upx;
+    box-sizing: border-box;
+    background: linear-gradient(to bottom,#3385FF, #fff);
+    &>.header_inside{
+      position: relative;
+      height: 190upx;
+      margin-top: 30upx;
+      background: #fff;
+      box-shadow: 0px 1px 21px 0px rgba(161, 166, 173, 0.4);
+      border-radius: 20px;
+      padding: 30upx;
+      box-sizing: border-box;
+      &>image{
+        height: 130upx;
+        width: 130upx;
+        display: inline-block;
+        border-radius: 10px;
+        background-color: #eee;
+        vertical-align: top;
+      }
+      &>.shop_info{
+        vertical-align: top;
+        display: inline-block;
+        height: 100%;
+        margin-left: 30upx;
+        &>.shop_title{
+          margin-top: 14upx;
+          font-size: 40px;
+          font-weight: 600;
+          color: #060606;
+        }
+        &>.shop_intro{
+          margin-top: 15upx;
+          font-size: 26px;
+          font-weight: 400;
+          color: #666666;
+        }
+      }
+      &>.iconfont{
+        font-size: 40upx;
+        position: absolute;
+        right: 30upx;
+        top: 50%;
+        transform: translateY(-50%);
+        color: #3385FF;
+      }
+    }
+  }
 	.input-wrap {
 		padding: 22px 20px 22px 30px;
 	}

mallApp/src/pages/class/index.vue

@@ -33,7 +33,7 @@
           <text style="font-size: 40upx;padding-left: 10upx;">{{pageData.price}}</text>
         </text>
       </text>
-      <view class="confirm_btn" @click="confirm">确认</view>
+      <view class="confirm_btn" @click="confirm">提交</view>
     </view>
   </view>
 </template>
@@ -63,31 +63,42 @@ export default{
   },
   methods: {
     confirm(){
-      if(this.dataList.form.nickname === ''){
-        this.$msg('请输入昵称')
+      let that = this
+      if(that.dataList.form.nickname === ''){
+        that.$msg('请输入昵称')
         return false
       }
-      if(this.dataList.form.mobile === ''){
-        this.$msg('手机号不能为空')
+      if(that.dataList.form.mobile === ''){
+        that.$msg('手机号不能为空')
         return false
       }
-       if (!/^1[34578]\d{9}$/.test(this.dataList.form.mobile)){
-           this.$msg('请输入正确的手机号')
+       if (!/^1[34578]\d{9}$/.test(that.dataList.form.mobile)){
+           that.$msg('请输入正确的手机号')
            return false
        }
-         if(this.dataList.form.name === ''){
-        this.$msg('请输入姓名')
+         if(that.dataList.form.name === ''){
+        that.$msg('请输入姓名')
         return false
       }
-      pxApplyAdd(this.dataList.form).then(res=>{
-        pxApplyWxPay({orderSn: res.data.orderSn}).then(res =>{
-          console.log(res)
-          weixinPay(res.data, this.successFn(), this.errorFn())
-        }).catch(err => { console.log(err, 'err') })
-        console.log(this.dataList.form.classId, 'classId')
-        console.log(res, 'res', pxApplyWxPay)
-      }).catch(err => {})
-      
+      uni.showModal({
+        title: '提示',
+        content: '这是一个模态弹窗',
+        success: function (res) {
+            if (res.confirm) {
+                console.log('用户点击确定', );
+                pxApplyAdd(that.dataList.form).then(res=>{
+                  pxApplyWxPay({orderSn: res.data.orderSn}).then(res =>{
+                    console.log(res)
+                    weixinPay(res.data, that.successFn, that.errorFn)
+                  }).catch(err => { console.log(err, 'err') })
+                  console.log(that.dataList.form.classId, 'classId')
+                  console.log(res, 'res', pxApplyWxPay)
+                }).catch(err => {})
+            } else if (res.cancel) {
+                console.log('用户点击取消');
+            }
+        }
+      });
     },
     successFn() {
       uni.navigateTo({

mallApp/src/pages/class/paySuccess.vue

@@ -19,6 +19,9 @@ export default {
   name: "AppResult",
   methods: {
     goClose () {
+      uni.switchTab({
+        url: '/pages/home/course'
+      })
     }
   }
 };