门店管理

ghsApp/src/admin/home/me.vue

@@ -17,7 +17,7 @@
               <image :src="myInfo.shopImg" style="width:110upx;border-radius:100upx;" mode="widthFix" @click="pageTo({url:'/admin/home/login'})" v-else>
               </image>
 
-              <view class="top-info_box" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentGhsShopId > 0">
+              <view class="top-info_box" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentGhsShopId > 0" @click="pageTo({url: '/admin/shop/add?id='+myInfo.shopInfo.id})">
                 <view> {{ myInfo.shopName||'' }}
                 <text v-if="myInfo.shopInfo && myInfo.shopInfo.default && myInfo.shopInfo.default == 1" class="default-shop">总店</text>
                 </view>
@@ -28,7 +28,7 @@
               </view>
 
             </view>
-            <button v-if="getLoginInfo.switchShop" @click="modifyShop" class="admin-button-com default chang-shop_btn" > <i class="iconfont iconqiehuan1"></i> 切换门店 </button>
+            <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 -->

ghsApp/src/admin/shop/add.vue

@@ -134,16 +134,6 @@
 					</view>
 				</tui-list-cell>
 
-				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title ">消费不足</view>
-					<input v-model="form.lackExpend" @focus="form.lackExpend=''" placeholder-class="phcolor" class="tui-input" name="lackExpend" placeholder="消费不足多少需要包装费" type="digit" />
-				</tui-list-cell>
-
-				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title ">包装费</view>
-					<input v-model="form.packCost" @focus="form.packCost=''" placeholder-class="phcolor" class="tui-input" name="packCost" placeholder="包装费" type="digit" />
-				</tui-list-cell>
-
 				<tui-list-cell class="line-cell" :hover="false">
 					<view class="tui-title">显示销量</view>
 					<view>
@@ -165,6 +155,29 @@
 					</view>
 				</tui-list-cell>
 
+				<tui-list-cell class="line-cell" :hover="false">
+					<view class="tui-title " style="color:#3385FF;">整单满</view>
+					<input v-model="form.meetNum" @focus="form.meetNum=''" placeholder-class="phcolor" class="tui-input" name="meetNum" placeholder="多少笔" type="digit" />
+				</tui-list-cell>
+				<tui-list-cell class="line-cell" :hover="false">
+					<view class="tui-title " style="color:#3385FF;">整单满</view>
+					<input v-model="form.meetAmount" @focus="form.meetAmount=''" placeholder-class="phcolor" class="tui-input" name="meetAmount" placeholder="多少钱" type="digit" />
+				</tui-list-cell>
+				<tui-list-cell class="line-cell" :hover="false">
+					<view class="tui-title " style="color:#3385FF;">优惠金额</view>
+					<input v-model="form.cutAmount" @focus="form.cutAmount=''" placeholder-class="phcolor" class="tui-input" name="cutAmount" placeholder="优惠金额" type="digit" />
+				</tui-list-cell>
+
+				<tui-list-cell class="line-cell" :hover="false">
+					<view class="tui-title ">消费不足</view>
+					<input v-model="form.lackExpend" @focus="form.lackExpend=''" placeholder-class="phcolor" class="tui-input" name="lackExpend" placeholder="消费不足多少需要包装费" type="digit" />
+				</tui-list-cell>
+
+				<tui-list-cell class="line-cell" :hover="false">
+					<view class="tui-title ">加包装费</view>
+					<input v-model="form.packCost" @focus="form.packCost=''" placeholder-class="phcolor" class="tui-input" name="packCost" placeholder="包装费" type="digit" />
+				</tui-list-cell>
+
 			</view>
 			<view class="confirm-btn">
 				<button class="admin-button-com big blue" formType="submit">提交</button>
@@ -216,6 +229,9 @@ export default {
 				telephone:'',
 				packCost:0,
 				lackExpend:9,
+				meetNum:0,
+				meetAmount:0,
+				cutAmount:0,
 				img: [],
 				allowDebt:0,
 				allowDebtAmount:5000,