Merge branch 'master' into debt

ghsApp/src/admin/custom/set.vue

@@ -24,7 +24,7 @@
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false" v-if="form.allowDebt == 1">
-					<view class="tui-title ">新客欠款额度</view>
+					<view class="tui-title ">新客授信额度</view>
 					<input type="number" v-model="form.allowDebtAmount" @focus="form.allowDebtAmount=''" placeholder-class="phcolor" class="tui-input" name="allowDebtAmount" placeholder="请填写金额" />
 				</tui-list-cell>
 

ghsApp/src/admin/home/me.vue

@@ -86,13 +86,14 @@
               <view class="tui-title" style="color:green;">斗南版视频</view>
             </tui-list-cell>
 
-            <tui-list-cell @click="pageTo({ url: '/admin/shop/changeShop' })" class="line-cell" :hover="false" :arrow="true" v-if="getLoginInfo.lookAllShop && getLoginInfo.lookAllShop == 1" >
-              <view class="tui-title">管理商家</view>
-            </tui-list-cell>
             <tui-list-cell @click="pageTo({ url: '/admin/shop/showShop' })" class="line-cell" :hover="false" :arrow="true" v-if="getLoginInfo.lookAllShop && getLoginInfo.lookAllShop == 1" >
               <view class="tui-title">营业商家</view>
             </tui-list-cell>
 
+            <tui-list-cell @click="pageTo({ url: '/admin/shop/changeShop' })" class="line-cell" :hover="false" :arrow="true" v-if="getLoginInfo.lookAllShop && getLoginInfo.lookAllShop == 1" >
+              <view class="tui-title">管理商家</view>
+            </tui-list-cell>
+
             <tui-list-cell @click="pageTo({ url: '/pagesClient/member/addCustom' })" class="line-cell" :hover="false" :arrow="true" v-if="getLoginInfo.lookAllShop && getLoginInfo.lookAllShop == 1" >
               <view class="tui-title">虚拟客户</view>
             </tui-list-cell>

ghsApp/src/admin/shop/changeShop.vue

@@ -56,7 +56,7 @@ export default {
 			}
 		},
 		showShop(){
-			getPtGhsShop({hasSale:0,pageSize:10,name:this.name}).then(res=>{
+			getPtGhsShop({hasSale:0,pageSize:15,name:this.name}).then(res=>{
 				this.shopData = res.data
 			})
 		},

hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "1.9.5",
-    "versionCode" : 195,
+    "versionName" : "1.9.6",
+    "versionCode" : 196,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -27,7 +27,7 @@
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
 				<button class="admin-button-com middle blue" v-if="ghsInfo.presell && ghsInfo.presell == 1" style="background-color:#09C567;border:1upx solid #09C567;" @click="aheadCg(ghsInfo)">预订花材</button>
-				<!-- <button class="admin-button-com middle blue" @click="delMemory()" v-else>清空已选</button> -->
+				<button class="admin-button-com middle blue" v-else @click="delMemory()" style="background-color: red;border:1upx solid red;">清空购物车</button>
 			</view>
 		</view>
 
@@ -136,7 +136,7 @@
 			<view style="position: fixed;bottom: 108upx;width:100vw;background-color:white;" @click.stop="">
 				<view class="commodity-view">
 					<view class="summary-bar">
-						<button class="admin-button-com blue middle" @click.stop="delMemory()">清空花材</button>
+						<button class="admin-button-com blue middle" @click.stop="delMemory()" style="background-color: red;border:1upx solid red;">清空购物车</button>
 					</view>
 					<view class="commodity-list">
 						<view class="commodity-item" v-for="(item, index) in selectList" :key="index">
@@ -432,8 +432,10 @@ export default {
 			this.pageTo({url: '/pagesPurchase/bookProduct?id='+id,type:2})
 		},
 		delMemory(){
-			this.cartItemShow = false
-			this.removeMemory(this.option.id)
+			this.$util.confirmModal({content:'确认要清空购物车？'},() => {
+				this.cartItemShow = false
+				this.removeMemory(this.option.id)
+			})
 		},
 		delItem(item) {
 			if(item.variety == 0){

开发/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "1.9.5",
-    "versionCode" : 195,
+    "versionName" : "1.9.6",
+    "versionCode" : 196,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

线上/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "1.9.5",
-    "versionCode" : 195,
+    "versionName" : "1.9.6",
+    "versionCode" : 196,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {