Merge branch 'master' into debt

ghsApp/src/admin/home/workbench.vue

@@ -31,17 +31,11 @@
 
 
   <block v-if="loginStyle  == 0">
-	<!-- #ifdef MP-WEIXIN -->
-    <view style="width:100vw;height:160upx;display:flex;align-items:center;justify-content:center;position:relative;">
-      <button class="admin-button-com big blue" style="width:260upx;" @click="buyItem()">花店买花</button>
-    </view>
-	<!-- #endif -->
     <view style="width:100vw;height:250upx;display:flex;align-items:center;justify-content:center;position:relative;margin-bottom:170upx;">
 		<button class="admin-button-com big blue" style="width:260upx;" @click="pageTo({url:'/admin/home/login'})">门店登录</button>
 		<text style="color:green;position:absolute;top:300upx;font-size:42upx;text-decoration: underline;" @click="pageTo({url:'/pagesClient/official/apply'})">我要注册</text>
 		<text style="color:green;position:absolute;top:420upx;font-size:42upx;text-decoration: underline;" @click.stop="toPhone()">联系官方</text>
     </view>
-
   </block>
   <block v-else>
 
@@ -212,14 +206,11 @@
 
 	<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 v-if="renewType == 0">为了加快系统的开发进度，实现大家需要的上下游连通、连麦芽田一键发跑腿、会员充值、散客到店自助下单等重要功能，特向您收取未来时间的年费，感谢您对公司的支持</view>
-            <view v-else-if="renewType == 2">请点击下方按钮续期</view>
-            <view v-else>因您最近系统提现不足3万/月，请付费使用软件，未续费系统将暂停提供服务</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()" style="width:200upx;">稍后</button>
-        		<button class="admin-button-com big blue" @click="startRenew()" style="margin-left:80upx;width:200upx;">续期</button>
+        		<button class="admin-button-com big blue" @click="startRenew()" style="margin-left:80upx;width:200upx;">续期一年</button>
 			</view>
         </view>
     </uni-popup>

ghsApp/src/admin/item/detail.vue

@@ -166,10 +166,10 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">每人限购</view>
-          <input v-model="form.limitBuy" style="width:300upx;" @focus="form.limitBuy=''" placeholder-class="phcolor" class="tui-input" name="limitBuy" placeholder="请填写，填0不限购" maxlength="50" type="number" />
+          <input v-model="form.limitBuy" style="width:105upx;" @focus="form.limitBuy=''" placeholder-class="phcolor" class="tui-input" name="limitBuy" placeholder="0不限购" maxlength="50" type="number" />
 
-          <button v-if="productData.id > 0 && form.limitBuy>0" class="admin-button-com blue middle" @click.stop="clearBuyCache()" style="width:150upx;">清已购</button>
-          <button v-else class="admin-button-com default middle" style="width:150upx;" @click.stop="">清已购</button>
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click.stop="clearBuyCache()" style="width:150upx;">清已购</button>
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" style="width:180upx;margin-left:10upx;" @click.stop="hasBuyList">已购列表</button>
 
         </tui-list-cell>
 
@@ -556,9 +556,12 @@ export default {
     }
   },
   methods: {
+    hasBuyList(){
+      this.$util.pageTo({url: '/admin/item/hasLimitBuyCustom?id='+this.productData.id})
+    },
     clearBuyCache(){
       let that = this
-      that.$util.confirmModal({content:'确认清除已购？清除后客户可再次下单'},() => {
+      that.$util.confirmModal({content:'确认清除？清除后全部客户重新计算限购数'},() => {
         clearLimitBuy({id:this.productData.id}).then(res=>{
           if(res.code == 1){
             this.$msg('已清除')

ghsApp/src/admin/item/hasLimitBuyCustom.vue

@@ -0,0 +1,243 @@
+<template>
+  <div class="app-main app-content">
+    <block v-if="!$util.isEmpty(customList)">
+      <block v-for="(item, index) in customList" :key="index">
+        <tui-list-cell>
+          <div class="tui-msg-box">
+            <img :src="item.smallAvatar" class="tui-msg-pic" mode="widthFix" />
+            <div class="tui-msg-item">
+              <div class="tui-msg-name">
+                <div class="tui-user-name">
+                  {{ item.name }}
+                  <text v-if="item.level == 2" class="super-man">大客户</text>
+                </div>
+              </div>
+              <div class="tui-msg-content">
+                <span>{{ item.visitTime.substr(5,11) }}</span>
+                <span style="color:black;margin-left:20upx;">已购 {{ item.hasLimitBuyNum }}</span>
+                <span style="color:black;margin-left:20upx;color:red;font-weight:bold;" v-if="item.hasReachLimitBuyNum == 1">已不能购买</span>
+              </div>
+            </div>
+            <button class="admin-button-com blue middle" @click="clearBuy(item)">清空已购</button>
+          </div>
+        </tui-list-cell>
+      </block>
+    </block>
+    <block v-else>
+      <app-wrapper-empty :is-empty="$util.isEmpty(customList)" title="暂无记录" />
+    </block>
+  </div>
+</template>
+<script>
+import TuiListCell from "@/components/plugin/list-cell";
+import BadgeModule from "@/components/plugin/badge";
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import appVipModule from "@/components/module/app-vip";
+import AppTag from "@/components/module/app-tag.vue";
+import AppSearchModule from "@/components/module/app-search";
+import { list } from "@/mixins";
+import { hasLimitBuyCustomList,clearOneLimitBuy } from "@/api/item";
+export default {
+  name: "hasLimitBuyCustom",
+  components: {
+    TuiListCell,
+    BadgeModule,
+    AppWrapperEmpty,
+    appVipModule,
+    AppTag,
+    AppSearchModule
+  },
+  mixins: [list],
+  data() {
+    return {
+      customList:[]
+    };
+  },
+  methods: {
+    init() {
+      hasLimitBuyCustomList({id:this.option.id}).then(res=>{
+        if(res.code == 1){
+          this.customList = res.data.customList?res.data.customList:[]
+        }
+      })
+    },
+    clearBuy(info){
+      this.$util.confirmModal({content:'确认清空？清空后客户可重新下单'},() => {
+          clearOneLimitBuy({customId:info.id,productId:this.option.id}).then(res=>{
+            if(res.code == 1){
+              this.$msg('清空成功')
+              this.init()
+            }
+          })
+      })
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.app-content {
+  padding-top: 10upx;
+  padding-bottom: 20upx;
+}
+.tabs-wrap {
+  position: fixed;
+  .tabs-left {
+    width: 80%;
+  }
+  .tabs-right {
+    width: 19%;
+    border-left: $borderColor;
+    @include disFlex(center, center);
+  }
+}
+  .input-wrap_box {
+    background-color: #fff;
+    position: fixed;
+    top: 0;
+    z-index: 10;
+    width: 100%;
+    height: 100upx;
+    display: flex;
+    align-items: center;
+    padding: 0 30upx;
+    & > view:nth-child(1) {
+      flex: 1;
+    }
+  }
+.tui-list-cell {
+  width: 100%;
+}
+.tui-msg-box {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .tui-msg-pic {
+    width: 80upx;
+    height: 80upx;
+    border-radius: 50%;
+    margin-right: 20upx;
+  }
+
+  .tui-msg-item {
+    flex: 1;
+    min-width: 0;
+    max-width: 500upx;
+    min-height: 80upx;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    & > div {
+      @include disFlex(center, flex-start);
+      & > div:first-child {
+        margin-right: 8upx;
+      }
+    }
+    .level-img {
+      ::v-deep.vip-text {
+        left: 70upx;
+        top: 8upx;
+      }
+    }
+    .normal-img {
+      width: 70upx;
+      padding: 2upx 6upx;
+      color: #999;
+      background-color: #f0f2f6;
+      border-radius: 20upx;
+      .vip-text {
+        font-size: 24upx;
+        transform: scale(0.6);
+        position: relative;
+        top: -2upx;
+        left: -8upx;
+      }
+    }
+    .member-img {
+      width: 70upx;
+      padding: 2upx 6upx;
+      color: green;
+      background-color: #f0f2f6;
+      border-radius: 20upx;
+      .vip-text {
+        font-size: 24upx;
+        transform: scale(0.6);
+        position: relative;
+        top: -2upx;
+        left: -8upx;
+      }
+    }
+    .iconfont {
+      color: #00aaed;
+    }
+  }
+
+  .tui-msg-name {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    font-size: 30upx;
+    line-height: 1;
+    color: #262b3a;
+    .tui-user-name {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      width: 290upx;
+      .super-man{
+        margin-left:20upx;
+        color:red;
+        font-size:24upx;
+        display:inline-block;
+        color:white;
+        border:1upx solid green;
+        padding:8upx 10upx;
+        background-color: green;
+        border-radius: 11upx;
+      }
+    }
+  }
+
+  .tui-msg-content {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    font-size: 24upx;
+    line-height: 1;
+    color: #9397a4;
+    .debt-amount{
+      margin-left:20upx;
+      .amount_num{
+        color:red;
+        margin-left:6upx;
+        font-weight:bold;
+      }
+    }
+  }
+  .admin-button-com {
+    margin-left: 20upx;
+    white-space: nowrap;
+  }
+}
+.tui-msg-right {
+  max-width: 120upx;
+  height: 80upx;
+  margin-left: auto;
+  margin-right: 24upx;
+  text-align: right;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.user_tag {
+  border: 1upx solid #cccccc;
+  padding: 5upx 12upx 5upx 12upx;
+  border-radius: 25upx;
+  color: #bbbbbb;
+  margin-right: 10upx;
+  margin-bottom: 12upx;
+  display: inline-block;
+  font-size: 30upx;
+}
+</style>

ghsApp/src/admin/shop/renew.vue

@@ -1,14 +1,11 @@
 <template>
     <view>
         <view style="padding:40upx 20upx 40upx 20upx;height:auto;width:95vw;font-size:36upx;">
-            <view v-if="renewType == 0">为了加快系统的开发进度，实现大家需要的上下游连通、连麦芽田一键发跑腿、会员充值、散客到店自助下单等重要功能，特向您收取未来时间的年费，感谢您对公司的支持</view>
-            <view v-else-if="renewType == 2">请点击下方按钮续期</view>
-            <view v-else>因您最近系统提现不足3万/月，请付费使用软件，未续费系统将暂停提供服务</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()" style="width:200upx;">稍后</button>
-        		<button class="admin-button-com big blue" @click="startRenew()" style="margin-left:80upx;width:200upx;">续期</button>
+        		<button class="admin-button-com big blue" @click="startRenew()" style="margin-left:80upx;width:200upx;">续期一年</button>
 			</view>
         </view>
     </view>

ghsApp/src/api/item/index.js

@@ -1,5 +1,14 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
+//限购花材已购客户列表
+export const hasLimitBuyCustomList = data => {
+	return https.get('/item/has-limit-buy-custom-list', data)
+}
+
+export const clearOneLimitBuy = data => {
+	return https.get('/item/clear-one-limit-buy', data)
+}
+
 export const clearLimitBuy = data => {
 	return https.get('/item/clear-limit-buy', data)
 }

ghsApp/src/pages.json

@@ -434,7 +434,8 @@
 				{"path": "select","style": {"navigationBarTitleText": "添加花材"}},
 				{"path": "loan","style": {"navigationBarTitleText": "花材列表"}},
 				{"path": "change","style": {"navigationBarTitleText": "更换花材"}},
-				{"path": "lakala","style": {"navigationBarTitleText": "拉卡拉"}}
+				{"path": "lakala","style": {"navigationBarTitleText": "拉卡拉"}},
+				{"path": "hasLimitBuyCustom","style": {"navigationBarTitleText": "已购列表"}, "enablePullDownRefresh": false}
 			]
 		},
 		{

ghsPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝收银",
     "appid" : "__UNI__E2D4F80",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.4.4",
-    "versionCode" : 144,
+    "versionName" : "1.4.5",
+    "versionCode" : 145,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

hdApp/src/admin/home/login.vue

@@ -51,11 +51,6 @@
 					</checkbox-group>
 				</view>
 				<!-- #endif -->
-				<!-- #ifdef MP-WEIXIN -->
-				<view style="margin-top:85upx;color:red;font-size:34upx;width:100%;text-align:right;padding-right:70upx;">
-					<text @click="pageTo({url:'/admin/home/loginRemind'})" >登录遇到了问题？点这里</text>
-				</view>
-				<!-- #endif -->
 				<!-- #ifdef APP-PLUS -->
 				<view style="margin-top:85upx;color:red;font-size:34upx;width:100%;text-align:right;padding-right:70upx;">
 					<text @click="pageTo({url:'/admin/home/appLoginRemind'})" >登录失败？请点击这里解决</text>

hdApp/src/admin/home/workbench.vue

@@ -3,10 +3,7 @@
   <block v-if="loginStyle  == 0">
     <view style="width:100vw;height:500upx;display:flex;align-items:center;justify-content:center;">
       <button class="admin-button-com big blue" @click="pageTo({url:'/admin/home/login'})">点我登录</button>
-      <view style="position:absolute;top:360upx;font-size:30upx;">
-        <text style="color:red;font-weight:bold;">伙伴和员工</text>
-        需要登录，请联系批发店添加员工
-      </view>
+      <view style="position:absolute;top:380upx;font-size:36upx;color:green;text-decoration: underline;" @click="pageTo({url:'/pagesClient/official/apply'})">注册账号</view>
     </view>
   </block>
   <block v-else>

hdApp/src/api/purchase/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const cancelOrder = data => {
+	return https.get("/purchase/cancel", data);
+};
+
 export const getAliPayCode = data => {
 	return https.get("/purchase/get-ali-pay-code", data);
 };

hdApp/src/pages.json

@@ -143,7 +143,7 @@
 				{ "path": "official/index", "style": { "navigationBarTitleText": "花掌柜" } },
 				{ "path": "official/pay", "style": { "navigationBarTitleText": "支付" } },
 				{ "path": "official/renewal", "style": { "navigationBarTitleText": "续期" } },
-				{ "path": "official/apply", "style": { "navigationBarTitleText": "完善店铺信息" } },
+				{ "path": "official/apply", "style": { "navigationBarTitleText": "填写信息" } },
 				{ "path": "official/clientApply", "style": { "navigationBarTitleText": "结果" } },
 				{ "path": "official/clientResult", "style": { "navigationBarTitleText": "提交审核" } },
 				{ "path": "official/callback", "style": { "navigationBarTitleText": "回调" } },

hdApp/src/pagesClient/official/apply.vue

@@ -46,8 +46,8 @@
         <tui-list-cell class="line-cell" :hover="false" >
           <div class="tui-title">类型</div>
           <div>
-            <button class="admin-button-com middle" :class="[isHd == 1 ? 'blue' : 'default']" @click="isHd=1">我有开店</button>
-            <button class="admin-button-com middle" :class="[isHd == 0 ? 'blue' : 'default']" style="margin-left:30upx;" @click="isHd=0">我没有开店</button>
+            <button class="admin-button-com middle" :class="[isHd == 1 ? 'blue' : 'default']" @click="isHd=1">我有店</button>
+            <button class="admin-button-com middle" :class="[isHd == 0 ? 'blue' : 'default']" style="margin-left:30upx;" @click="isHd=0">我没店</button>
           </div>
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false" >

hdApp/src/pagesPurchase/components/wangCg.vue

@@ -81,9 +81,7 @@ export default {
     },
     goLogin(){
       let that = this
-      that.$util.confirmModal({content:'如您的伙伴和员工也需要登录，请联系批发店添加员工',okText:'知道了'},() => {
-        that.pageTo({url: '/admin/home/login'})
-      })  
+      that.pageTo({url: '/admin/home/login'})
     }
   },
 };

hdApp/src/pagesPurchase/purDetails.vue

@@ -303,20 +303,22 @@
     </view>
     <view class="app-footer open_btn">
 
+
+      <button class="admin-button-com blue big" v-if="detailInfo.status == 1" style="margin-right:40upx;" @click="cancelMyOrder()">取消</button>
+
       <block v-if="detailInfo.status != 1">
         <block v-if="afterSale == 1">
-          <button class="admin-button-com blue big" style="margin-right:60upx;" @click="refundOrder()">申请售后</button>
+          <button class="admin-button-com blue big" style="margin-right:40upx;" @click="refundOrder()" v-if="detailInfo.payStatus == 1">申请售后</button>
         </block>
       </block>
 
-      <button class="admin-button-com blue big" open-type="share" v-if="detailInfo.status!=5 && detailInfo.payStatus != 1" 
-      style="margin-right:50upx;padding-left:50upx;padding-right:50upx;">邀请付款</button>
+      <button class="admin-button-com blue big" open-type="share" v-if="detailInfo.status!=5 && detailInfo.payStatus != 1" style="margin-right:50upx;padding-left:50upx;padding-right:50upx;">邀请付款</button>
 
       <block v-if="detailInfo.book == 0">
-        <button class="admin-button-com blue big" v-if="detailInfo.status== 3 || detailInfo.status== 2" @click="affirmTake()" style="margin-right:50upx;padding-left:50upx;padding-right:50upx;">确认收货</button>
+        <button class="admin-button-com blue big" v-if="detailInfo.status== 3 || detailInfo.status== 2" @click="affirmTake()" style="margin-right:50upx;padding-left:30upx;padding-right:30upx;">确认收货</button>
       </block>
       <block v-else>
-        <button class="admin-button-com blue big" v-if="detailInfo.status== 3" @click="affirmTake()" style="margin-right:50upx;padding-left:50upx;padding-right:50upx;">确认收货</button>
+        <button class="admin-button-com blue big" v-if="detailInfo.status== 3" @click="affirmTake()" style="margin-right:40upx;padding-left:30upx;padding-right:30upx;">确认收货</button>
       </block>
 
       <!-- <button class="admin-button-com blue big" v-if="detailInfo.status== 4" @click="affirmTake()" style="margin-right:50upx;padding-left:50upx;padding-right:50upx;">再次改价</button> -->
@@ -335,7 +337,7 @@
 <script>
 import { mapGetters } from "vuex";
 import { getCgExpressTrack } from "@/api/express"
-import { purchaseDetail, purchaseDebtPay,purchaseClearCreateOrder,confirmTake } from "@/api/purchase";
+import { purchaseDetail, purchaseDebtPay,purchaseClearCreateOrder,confirmTake,cancelOrder } from "@/api/purchase";
 import TuiListCell from "@/components/plugin/list-cell";
 import { getGhsDataApi } from "@/api/ghs";
 export default {
@@ -431,6 +433,16 @@ export default {
 				}
 			});
 		},
+    cancelMyOrder(){
+        this.$util.confirmModal({content:'确认取消？'},() => {
+          cancelOrder({id:this.detailInfo.id}).then(res=>{
+            if(res.code == 1){
+              this.$msg('取消成功')
+              this.beginInit()
+            }
+          })
+        })
+    },
     refundOrder(){
       if(this.loginStyle == 0){
         this.$msg('请先登录')

hdApp/src/pagesPurchase/readMe.vue

@@ -1,6 +1,11 @@
 <template>
 	<view class="app-content">
 
+		<view class="list" v-if="shopId == 65591">
+			<view>
+				<image mode="widthFix" :src="`${constant.imgUrl}/ghs/jnwwxh.jpg`" style="width:100%;"></image>
+			</view>
+		</view>
 
 		<view class="list" v-if="shopId == 12439">
 			<view>

hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.0",
-    "versionCode" : 180,
+    "versionName" : "1.8.1",
+    "versionCode" : 181,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发http/ghsPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝收银",
     "appid" : "__UNI__E2D4F80",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.4.4",
-    "versionCode" : 144,
+    "versionName" : "1.4.5",
+    "versionCode" : 145,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发http/hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.0",
-    "versionCode" : 180,
+    "versionName" : "1.8.1",
+    "versionCode" : 181,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发https/ghsPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝收银",
     "appid" : "__UNI__E2D4F80",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.4.4",
-    "versionCode" : 144,
+    "versionName" : "1.4.5",
+    "versionCode" : 145,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发https/hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.0",
-    "versionCode" : 180,
+    "versionName" : "1.8.1",
+    "versionCode" : 181,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

线上/ghsPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝收银",
     "appid" : "__UNI__E2D4F80",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.4.4",
-    "versionCode" : 144,
+    "versionName" : "1.4.5",
+    "versionCode" : 145,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

线上/hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.0",
-    "versionCode" : 180,
+    "versionName" : "1.8.1",
+    "versionCode" : 181,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {