Merge branch 'pay'

ghsApp/src/admin/home/me.vue

@@ -31,12 +31,11 @@
             <button v-if="getLoginInfo.switchShop" @click.stop="modifyShop" class="admin-button-com default chang-shop_btn" > <i class="iconfont iconqiehuan1"></i> 切换门店 </button>
           </view>
           <view class="image-box" >
-            <!-- #ifdef MP-WEIXIN -->
-            <view class="dec">到期时间 {{ myInfo.deadline ? myInfo.deadline.substr(0,11) : '' }}</view>
-            <!-- #endif -->
-            <!-- #ifdef APP-PLUS --> 
-            <view class="dec"></view>
-            <!-- #endif -->
+            <view class="dec">
+              <block v-if="showDeadline">
+                到期时间 {{ myInfo.shopInfo && myInfo.shopInfo.deadline ? myInfo.shopInfo.deadline.substr(0,11) : '' }}
+              </block>
+            </view>
             <image :src="`${constant.imgUrl}/ghs/me/upgrade2.png`"></image> 
           </view>
         </view>
@@ -218,7 +217,8 @@ export default {
       inAmountShow:false,
       inAmountFocus:false,
       outAmountFocus:false,
-      lookMoney:0
+      lookMoney:0,
+      showDeadline:false
     };
   },
   onPullDownRefresh () {
@@ -234,6 +234,21 @@ export default {
     if(plus.runtime.version){
       this.version = plus.runtime.version
     }
+
+    let that = this
+    let type = uni.getSystemInfoSync().platform
+    switch(type){
+      case 'android':
+        that.showDeadline = true
+        break;
+      case 'ios':
+        that.showDeadline = false
+        break;
+      default:
+    }
+    // #endif
+    // #ifdef MP-WEIXIN
+    this.showDeadline = true
     // #endif
   },
   methods: {

ghsApp/src/admin/home/workbench.vue

@@ -128,6 +128,19 @@
 		</view>
 	</uni-popup>
 
+	<uni-popup ref="renewRef" background-color="#fff" type="center" :animation="false" class="class-popup-style" :mask-click="false">
+        <view style="padding:40upx 20upx 40upx 20upx;height:auto;width:95vw;font-size:36upx;">
+			<view>为了加快系统的开发进度，实现大家需要的<text style="font-weight:bold;color:#3385FF;">上下游连通</text>、<text style="font-weight:bold;color:#3385FF;">连麦芽田一键发跑腿</text>、<text style="font-weight:bold;color:#3385FF;">会员和充值</text>、<text style="font-weight:bold;color:#3385FF;">散客到店自助下单</text>等重要功能</view>
+			<view style="margin-top:24upx;">特向您收取未来时间的年费，感谢您对公司的支持</view>
+			<view style="margin-top:24upx;">当前系统到期时间：{{ currentDeadline }}</view>
+			<view style="margin-top:24upx;">续期一年到期时间：<text style="color:#3385FF;">{{ newDeadline }}</text></view>
+			<view style="margin-top:40upx;text-align:center;">
+				<button class="admin-button-com big default" @click="closeRenew()">稍后再说</button>
+        		<button class="admin-button-com big blue" @click="startRenew()" style="margin-left:80upx;">续期一年</button>
+			</view>
+        </view>
+    </uni-popup>
+
 </view>
 </template>
 
@@ -144,6 +157,8 @@ import autoUpdateMixins from "@/mixins/autoUpdate";
 import { getWeixinId } from "@/api/invite/index";
 import { getErrorPrice } from "@/api/item"
 import { getStaffInfo } from "@/api/shop-admin"
+import { renewShop,noRemind,needRemind } from "@/api/renew"
+import wexinPay from "@/utils/pay/wxPay";
 export default {
 	name: "workbench",
 	components: {  },
@@ -187,7 +202,9 @@ export default {
 			loginStyle :0,
 			errorPirceList:[],
 			lookMoney:0,
-			notifyNum:0
+			notifyNum:0,
+			currentDeadline:'',
+			newDeadline:''
 		};
 	},
 	onShareAppMessage(res) {
@@ -216,6 +233,15 @@ export default {
 		if(this.$util.isScanEnv()){
 			this.isScanEnv = true
 		}
+		// #ifdef APP-PLUS
+		let type = uni.getSystemInfoSync().platform
+		if(type == 'android'){
+			this.popRenew()
+		}
+		// #endif
+		// #ifdef MP-WEIXIN
+			this.popRenew()
+		// #endif
 	},
 	onPullDownRefresh() {
 		this.init();
@@ -237,6 +263,38 @@ export default {
 		...mapActions(['setUserShopAll']),
 		toPhone(){
 			uni.makePhoneCall({ phoneNumber:'15280215347' })
+		},
+		closeRenew(){
+			this.$refs.renewRef.close()
+			noRemind().then(res=>{ })
+		},
+		popRenew(){
+			let that = this
+			needRemind().then(res=>{
+				if(res.code == 1){
+					that.currentDeadline = res.data.currentDeadline
+					that.newDeadline = res.data.newDeadline
+					if(res.data.need && res.data.need == 1){
+						that.$refs.renewRef.open('center')
+					}
+				}
+			})
+		},
+		startRenew(){
+			uni.showLoading({mask:true})
+			renewShop().then(res=>{
+				uni.hideLoading()
+				if(res.code == 1){
+					wexinPay(res.data, this.getSuccess, this.getError)
+				}
+			})
+		},
+		getSuccess(){
+			this.closeRenew();
+			this.$util.pageTo({ url: "/admin/shop/renewSuccess"})
+		},
+		getError(){
+
 		},
 		getShopName(){
 			currentShop().then(res => {
@@ -712,4 +770,8 @@ export default {
 		font-size: 34upx;
 	}
 }
+.class-popup-style{
+	z-index:99999;
+	border-radius:20upx;
+}
 </style>

ghsApp/src/admin/item/detail.vue

@@ -279,6 +279,7 @@
         </view>
       </view>
     </uni-popup>
+
 		<uni-popup ref="rightShowMore" background-color="#fff" type="center" :animation="true" class="class-popup-style">
 			<view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
         <view style="width:100vw;margin-top:8upx;"><button @click="goWaste(productData)">报损</button></view>

ghsApp/src/admin/shop/renewSuccess.vue

@@ -0,0 +1,161 @@
+<template>
+    <view class="app-content">
+      <view class="billing_box_bg">
+        <view class="top-view"> </view>
+        <view class="result-view">
+          <view :class="['iconfont', 'iconchenggong']"></view>
+          <view class="result-title">续期成功</view>
+          <view class="result-title">已延长到：{{ deadline?deadline.substr(0,10):'' }}</view>
+          <button class="admin-button-com big" style="width:45vw;margin-top:20upx;" @click="goBack">返回</button>
+        </view>
+      </view>
+    </view>
+  </template>
+  <script>
+  import { mapGetters } from "vuex";
+  import {currentShop} from "@/api/shop";
+  export default {
+    name: "renewSuccess",
+    data() {
+      return {
+        deadline:''
+      }
+    },
+    onLoad () {
+    },
+    methods: {
+      goBack(){
+        uni.navigateBack({delta:1})
+      },
+      init(){
+        let that = this
+        currentShop().then(res => {
+          if(res.code == 1){
+            that.deadline = res.data.deadline
+          }
+        })
+      }
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+  .go-back{
+      width: 80%;
+      height: 80upx;
+      color: #FFFFFF;
+      margin-top: 50upx;
+      background: #3385FF;
+      border-radius: 10upx;
+      font-size:30upx;
+  }
+  .title{
+      font-weight:700;
+      margin-bottom:30upx;
+      font-size:30upx;
+  }
+  .product-area{
+      width:730upx;
+      height:90upx;
+      display:flex;
+      align-items:center;
+      .first-area{
+          border-bottom:1upx solid #e4e2e2;
+          position:relative;
+      width:550upx;
+          .name{
+              width:280upx;
+              overflow: hidden;
+              text-overflow:ellipsis;
+              white-space: nowrap;
+              display:inline-block;
+              font-weight:bold;
+              font-size:28upx;
+          }
+          .cg-cost{
+              font-weight:bold;
+              font-size:27upx;
+              color:red;
+              position:absolute;
+              left:480upx;
+              top:8upx;
+          }
+          .cost-price{
+              font-weight:bold;
+              font-size:27upx;
+              color:blue;
+              position:absolute;
+              left:515upx;
+              top:18upx;
+          }
+          input{
+              border:1upx solid #cccccc;
+              display:inline-block;
+              width:135upx;
+              margin-left:10upx;
+              margin-right:30upx;
+              text-align:center;
+              font-size:30upx;
+          }
+      }
+      .second-area{
+          float:left;
+          color:#646464;
+          margin-top:10upx;
+          .one{
+              color:red;
+          }
+          .two{
+              color:#CCCCCC;
+          }
+      }
+  }
+  .billing_box_bg {
+    position: relative;
+    padding: 30upx 30upx;
+    display: flex;
+    flex-direction: column;
+    background-color: #f5f5f5;
+    .top-view {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 299upx;
+      background: #3385ff;
+      border-radius: 0upx 0upx 83upx 83upx;
+    }
+    .result-view {
+      position: relative;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      padding: 30upx 70upx 70upx 70upx;
+      width: 100%;
+      background: #ffffff;
+      border-radius: 20upx;
+      z-index: 1;
+      .iconchenggong {
+        font-size: 170upx;
+        color: $mainColor1;
+      }
+      .result-title {
+        margin: 20upx 0 50upx;
+        font-size: 32upx;
+      }
+      .close_btn {
+        line-height: 88upx;
+        text-align: center;
+        width: 550upx;
+        height: 88upx;
+        border: 1px solid #dddddd;
+        border-radius: 8upx;
+        font-size: 32upx;
+        color: #666;
+      }
+    }
+    .admin-button-com {
+      margin-bottom: 20upx;
+      width: 100%;
+    }
+  }
+  </style>

ghsApp/src/api/renew/index.js

@@ -0,0 +1,13 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+export const renewShop = data => {
+	return https.get('/renew/create', data)
+}
+
+export const noRemind = data => {
+	return https.get('/renew/no-remind', data)
+}
+
+export const needRemind = data => {
+	return https.get('/renew/need-remind', data)
+}

ghsApp/src/pages.json

@@ -197,6 +197,7 @@
 			"pages": [
 				{"path": "list","style": {"navigationBarTitleText": "门店"}},
 				{"path": "add","style": {"navigationBarTitleText": ""}},
+				{"path": "renewSuccess","style": {"navigationBarTitleText":"续期成功"}},
 				{"path": "print","style": {"navigationBarTitleText": "小票机"}},
 				{"path": "wcPrint","style": {"navigationBarTitleText": "采购小票机"}},
 				{"path": "trumpet","style": {"navigationBarTitleText": "云音箱"}},

ghsApp/src/pagesClient/member/addCustomer.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-content">
-    <view style="text-align:center;color:red;font-weight:bold;padding:10upx 0 10upx 0;font-size:27upx;">
-      必须填写客户真实手机号，否则引起数据错乱自行负责
+    <view style="text-align:center;color:red;font-weight:bold;padding:20upx 0 20upx 0;font-size:30upx;">
+      请填写客户真实手机号，否则引起数据错乱自行负责
     </view>
     <form @submit="formSubmit">
       <view class="module-com">

pt/src/cool/request/index.js

@@ -47,12 +47,14 @@ import ptCpItem from '@/service/pt-cp-item/index';
 import ptItem from '@/service/pt-item/index';
 import ptItemCatRelate from '@/service/pt-item-cat-relate/index';
 import apply from '@/service/apply/index';
+import renew from '@/service/renew/index';
 
 export function SET_SERVICE({ store }) {
 	// const files = require.context('@/service/', true, /\.js$/);
 	// const ignore = ['./request.js'];
 
 	let modules = {
+		renew,
 		ptItemCatRelate,
 		ptItem,
 		ptCpItem,

pt/src/mock/userInfo.js

@@ -167,7 +167,7 @@ let menu = {
 		{id: '12',parentId: '1',name: '商家列表',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/list',viewPath: 'saas/shop/list',keepAlive: 1},
 		{id: '14',parentId: '1',name: '员工管理',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/manage',viewPath: 'saas/shop/manage',keepAlive: 1},
 		{id: '15',parentId: '1',name: '小程序',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/upgrade',viewPath: 'saas/shop/upgrade',keepAlive: 1},
-		{id: '16',parentId: '1',name: '付费订单',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/buy',viewPath: 'saas/shop/buy',keepAlive: 1},
+		{id: '16',parentId: '1',name: '续期订单',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/buy',viewPath: 'saas/shop/buy',keepAlive: 1},
         {id: '17',parentId: '1',name: '提现申请',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/saas/shop/deposit',viewPath: 'saas/shop/deposit',keepAlive: 1},
 		{id: '10',parentId: null,name: '资产',type: 0,icon: 'icongongzuotai',orderNum: 1,router: '',viewPath: '',keepAlive: 1},
 		{id: '101',parentId: '10',name: '余额明细',type: 1,icon: 'icongongzuotai',orderNum: 1,router: '/assets/ptYeChange',viewPath: 'views/assets/ptYeChange',keepAlive: 1},

pt/src/saas/shop/buy.vue

@@ -1,6 +1,51 @@
 <template>
 	<div class="app-list-content">
-		<x-crud class="liu-crud-wrap" @load="onLoad"> </x-crud>
+		<x-crud class="liu-crud-wrap" @load="onLoad">
+
+			<template #table-column-beforeDeadline="{ scope }">
+				<span v-if="scope.row.status == 0">-</span>
+				<span v-else>
+					<span v-if="scope.row.beforeDeadline == '0000-00-00 00:00:00'">-</span>
+					<span v-else>{{ scope.row.beforeDeadline ? scope.row.beforeDeadline.substr(0,16):'' }}</span>
+				</span>
+			</template>
+
+			<template #table-column-deadline="{ scope }">
+				<span v-if="scope.row.status == 0">-</span>
+				<span v-else>
+					<span v-if="scope.row.deadline == '0000-00-00 00:00:00'">-</span>
+					<span v-else>{{ scope.row.deadline ? scope.row.deadline.substr(0,16):'' }}</span>
+				</span>
+			</template>
+
+			<template #table-column-addTime="{ scope }">
+				<span v-if="scope.row.addTime == '0000-00-00 00:00:00'">-</span>
+				<span v-else>{{ scope.row.addTime ? scope.row.addTime.substr(0,16):'' }}</span>
+			</template>
+
+			<template #table-column-payTime="{ scope }">
+				<span v-if="scope.row.payTime == '0000-00-00 00:00:00'">-</span>
+				<span v-else>{{ scope.row.payTime ? scope.row.payTime.substr(0,16):'' }}</span>
+			</template>
+
+			<template #table-column-status="{ scope }">
+				<span v-if="scope.row.status == 0">待续期</span>
+				<span v-else style="color:#3385FF;">已续期</span>
+			</template>
+
+			<template #slot-total-amount>
+				<span style="font-size:15px;font-weight:bold;">累计续费：{{ totalAmount }}</span>
+			</template>
+
+			<template #slot-cp-classStyle="{scope}">
+				<el-radio-group v-model="status" @change="renewShop" style="margin-right:20px;padding-top:6px;margin-left:20px;">
+				<el-radio label="-1">全部</el-radio>
+				<el-radio label="0">待续期</el-radio>
+				<el-radio label="1">已续期</el-radio>
+				</el-radio-group>
+			</template>
+
+		</x-crud>
 	</div>
 </template>
 
@@ -8,90 +53,132 @@
 export default {
 	data() {
 		return {
-			// x-crud
-			app: null
+			app: null,
+			status:'-1',
+			totalAmount:0
 		};
 	},
 	mounted() {},
 	methods: {
-		// crud
+		renewShop(e){
+			this.status = e
+			this.app.refresh({ status:this.status })
+		},
 		onLoad({ ctx, app }) {
 			this.app = app;
-			let applyHost = () => {
-				return this.$service.saasShop.buyList();
-			};
-			ctx.service({
-				page: applyHost
-			})
+			ctx.service(this.$service.renew)
 				.set('table', {
 					columns: [
 						{
 							prop: 'id',
 							label: 'ID',
-							align: 'center'
+							align: 'center',
+							width: 90,
+						},
+						{
+							prop: 'orderSn',
+							label: '编号',
+							align: 'center',
+							width: 130,
+						},
+						{
+							prop: 'payWay',
+							label: '支付方式',
+							align: 'center',
+							width: 80,
+						},
+						{
+							prop: 'shopAdminName',
+							label: '付款人',
+							align: 'center',
+							width: 100,
+						},
+						{
+							prop: 'sjName',
+							label: '商家',
+							align: 'center',
+							width: 130,
+						},
+						{
+							prop: 'shopName',
+							label: '门店',
+							align: 'center',
+							width: 80,
 						},
 						{
-							prop: 'name',
-							label: '花店名称',
-							align: 'center'
+							prop: 'pfLevel',
+							label: '等级',
+							align: 'center',
+							width: 80,
+						},
+						{
+							prop: 'actPrice',
+							label: '金额',
+							align: 'center',
+							emptyText: '',
+							width: 100,
 						},
 						{
-							prop: 'userName',
-							label: '店长',
-							align: 'center'
+							prop: 'year',
+							label: '年数',
+							align: 'center',
+							emptyText: '',
+							width: 60,
 						},
 						{
-							prop: 'mobile',
-							label: '手机号',
-							align: 'center'
+							prop: 'payTime',
+							label: '支付时间',
+							align: 'center',
+							emptyText: ''
 						},
 						{
-							prop: 'prePrice',
-							label: '付款金额',
+							prop: 'status',
+							label: '状态',
 							align: 'center',
-							emptyText: '无'
+							emptyText: ''
 						},
 						{
-							prop: 'createTime',
-							label: '付款时间',
+							prop: 'beforeDeadline',
+							label: '续期前',
 							align: 'center',
-							emptyText: '无'
+							emptyText: ''
 						},
 						{
-							prop: 'updateTime',
-							label: '到期时间',
+							prop: 'deadline',
+							label: '续期后',
 							align: 'center',
-							emptyText: '无'
+							emptyText: ''
 						},
 						{
-							prop: 'setName',
-							label: '套餐',
+							prop: 'addTime',
+							label: '创建时间',
 							align: 'center',
-							emptyText: '无'
-						}
+							emptyText: ''
+						},
 					],
-					// 操作列
 					op: {
-						visible: false, // 是否显示
-						// 同 element-ui Table-column Attributes
+						visible: true,
 						props: {
-							width: 150,
+							width: 100,
 							align: 'center',
 							fixed: 'right',
 							label: '操作'
 						},
-						// 布局，请移步 `layout`
 						layout: []
 					}
 				})
 				.set('layout', [
 					['slot-tabs'],
-					['flex1', 'refresh-btn'],
+					['slot-cp-classStyle','flex1', 'refresh-btn'],
 					['data-table'],
-					['flex1', 'pagination']
+					['slot-total-amount','flex1', 'pagination']
 				])
+				.on('refresh', async (params, { next }) => {
+					let res = await next(params)
+					this.totalAmount = res.totalAmount?res.totalAmount:0
+				})
 				.done();
-			app.refresh();
+				app.refresh({ status:this.status })
 		}
 	}
 };

pt/src/saas/shop/deposit.vue

@@ -33,6 +33,10 @@
 				</template>
 			</template>
 
+			<template #slot-total-amount>
+				<span style="font-size:15px;font-weight:bold;">累计提现：{{ totalAmount }}</span>
+			</template>
+
 		</x-crud>
 		<!-- 审核弹窗 -->
 		<el-dialog
@@ -92,7 +96,8 @@ export default {
 					key: '1'
 				}
 			],
-			tabIndex: '0'
+			tabIndex: '0',
+			totalAmount:0
 		};
 	},
 	mounted() {},
@@ -230,8 +235,12 @@ export default {
 					['slot-tabs'],
 					['flex1', 'refresh-btn'],
 					['data-table'],
-					['flex1', 'pagination']
+					['slot-total-amount','flex1', 'pagination']
 				])
+				.on('refresh', async (params, { next }) => {
+					let res = await next(params)
+					this.totalAmount = res.totalAmount?res.totalAmount:0
+				})
 				.done();
 			app.refresh();
 		}

pt/src/saas/shop/shop.vue

@@ -11,6 +11,33 @@
               <el-button type="text" @click="addStaff(scope.row)">添加员工</el-button>
               <el-button type="text" @click="clearStock(scope.row)">清库存</el-button>
             </template>
+
+            
+            <template #table-column-ptStyle="{scope}">
+                <span v-if="scope.row.ptStyle == 1" style="color:#CCCCCC;">零售花店</span>
+                <span v-else>
+                  <span v-if="scope.row.pfLevel == 0" style="color:brown;">城市批发</span>
+                  <span v-else style="color:blue;">斗南批发</span>
+                </span>
+            </template>
+
+            <template #table-column-hasRenew="{scope}">
+                <span v-if="scope.row.hasRenew == 0" style="color:#CCCCCC;">-</span>
+                <span v-else style="color:blue;">
+                  已续
+                </span>
+            </template>
+
+            <template #table-column-needRenew="{scope}">
+              <span v-if="scope.row.hasRenew == 1">
+                -
+              </span>
+              <span v-else>
+                <span v-if="scope.row.needRenew == 0" @click="changeRenewNeed(scope.row)" style="cursor: pointer;">未提醒</span>
+                <span v-else style="color:blue;cursor: pointer;" @click="changeRenewNeed(scope.row)">已提醒</span>
+              </span>
+            </template>
+
         </x-crud>
 
         <balance-detail v-if='showBalanceDetail' @closeFn='showBalanceDetail = false' ref="balanceDetail" :orderOperate="optionData" />
@@ -88,6 +115,12 @@ export default {
     mounted() {
     },
     methods: {
+      changeRenewNeed(info){
+          this.$service.shop.changeNeedRenew({id:info.id}).then(res => {
+            this.$message.success('操作成功')
+            this.app.refresh()
+          })
+        },
         clearStock(shop){
           this.clearStockPop = true 
           this.clearStockForm.shopId = shop.id
@@ -106,7 +139,6 @@ export default {
             if (valid) {
 
             } else {
-              console.log('出错了哦');
               return false;
             }
           })
@@ -129,7 +161,7 @@ export default {
                         {
                             prop: 'merchantName',
                             label: '商家',
-                            width: '120',
+                            width: '150',
                             align: 'center'
                         },
                         {
@@ -145,14 +177,14 @@ export default {
                             align: 'center'
                         },
                         {
-                            prop: 'balance',
-                            label: '余额',
+                            prop: 'hasRenew',
+                            label: '续期',
                             width: '100',
                             align: 'center'
                         },
                         {
-                            prop: 'totalIncome',
-                            label: '收入',
+                            prop: 'needRenew',
+                            label: '提醒',
                             width: '100',
                             align: 'center'
                         },
@@ -188,7 +220,7 @@ export default {
                             label: '地址',
                             align: 'center',
                             emptyText: '-',
-                            width: '370'
+                            width: '300'
                         }
                     ],
                     op: {

pt/src/service/renew/index.js

@@ -0,0 +1,6 @@
+import { BaseService, Service } from '@/cool';
+
+@Service('renew')
+export class RenewService extends BaseService {}
+
+export default new RenewService();

pt/src/service/shop/index.js

@@ -13,5 +13,12 @@ export class ShopService extends BaseService {
 		});
 	}
 
+	changeNeedRenew(data) {
+		return this.request({
+			url: '/need-renew-change',
+			params: data
+		});
+	}
+
 }
 export default new ShopService();

pt/src/store/modules/menu.js

@@ -179,7 +179,7 @@ let menu = {
 		{
 			id: '14',
 			parentId: '1',
-			name: '付费订单',
+			name: '续期订单',
 			type: 1,
 			icon: 'icongongzuotai',
 			orderNum: 1,