Merge branch 'zhongqi-stockLogic' into zhongqi-versionUpgrade

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/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>

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/pages.json

@@ -141,7 +141,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/confirmTake.vue

@@ -170,31 +170,31 @@ export default {
 		},
 		commitChange(doType){
 			let that = this
-      if(doType != 1){
-        let hasError = false
-        let errorHint = ''
-        this.flowersList.forEach(function(item){
-          if(that.$util.isMoney(item.suggestPrice) == false){
-            let name = item.name
-            errorHint = '请填写 '+name+' 批发价'
-            hasError = true
-          }
-          if(that.$util.isMoney(item.suggestSkPrice) == false){
-            let name = item.name
-            errorHint = '请填写 '+name+' 零售价'
-            hasError = true
-          }
-          if(that.$util.isMoney(item.suggestHjPrice) == false){
-            let name = item.name
-            errorHint = '请填写 '+name+' 大客价'
-            hasError = true
-          }
-        })
-        if(hasError){
-          this.$msg(errorHint)
-          return false
-        }
-      }
+			if(doType != 1){
+				let hasError = false
+				let errorHint = ''
+				this.flowersList.forEach(function(item){
+				if(that.$util.isMoney(item.suggestPrice) == false){
+					let name = item.name
+					errorHint = '请填写 '+name+' 批发价'
+					hasError = true
+				}
+				if(that.$util.isMoney(item.suggestSkPrice) == false){
+					let name = item.name
+					errorHint = '请填写 '+name+' 零售价'
+					hasError = true
+				}
+				if(that.$util.isMoney(item.suggestHjPrice) == false){
+					let name = item.name
+					errorHint = '请填写 '+name+' 大客价'
+					hasError = true
+				}
+				})
+				if(hasError){
+				this.$msg(errorHint)
+				return false
+				}
+			}
 			let hint = '确认提交？'
 			if(doType == 1){
 				hint = '确认仅入库不改价？'

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" : {