shish пре 3 година
родитељ
комит
ad62577491
2 измењених фајлова са 19 додато и 6 уклоњено
  1. 16 5
      ghsApp/src/admin/shop/add.vue
  2. 3 1
      hdApp/src/admin/billing/affirmGhs.vue

+ 16 - 5
ghsApp/src/admin/shop/add.vue

@@ -97,16 +97,23 @@
 				</tui-list-cell>
 				
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">显示库存</view>
+					<view class="tui-title">新客显示库存</view>
 					<view>
-						<switch style="transform:scale(0.7,0.7)" :checked="form.showStock == 0 ? false : true" @change="showStockChange" /> {{form.showStock==1 ? '新客户可以看库存' : '新客户不能看库存'}}
+						<switch style="transform:scale(0.7,0.7)" :checked="form.showStock == 0 ? false : true" @change="showStockChange" /> {{form.showStock==1 ? '是' : '否'}}
 					</view>
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title">允许欠款</view>
+					<view class="tui-title">新客审核</view>
 					<view>
-						<switch style="transform:scale(0.7,0.7)" :checked="form.allowDebt == 0 ? false : true" @change="allowDebtChange" /> {{form.allowDebt==0 ? '新客户不能欠款' : '新客户允许欠款'}}
+						<switch style="transform:scale(0.7,0.7)" :checked="form.isHd == 1 ? false : true" @change="isHdChange" /> {{form.isHd == 1 ? '不需要' : '需要'}}
+					</view>
+				</tui-list-cell>
+
+				<tui-list-cell class="line-cell" :hover="false">
+					<view class="tui-title">新客欠款</view>
+					<view>
+						<switch style="transform:scale(0.7,0.7)" :checked="form.allowDebt == 0 ? false : true" @change="allowDebtChange" /> {{form.allowDebt==0 ? '不能' : '允许'}}
 					</view>
 				</tui-list-cell>
 
@@ -199,7 +206,8 @@ export default {
 				default:0,
 				carSale:0,
 				dataSync:1,
-				showStock:1
+				showStock:1,
+				isHd:1
 			},
 			showRegion: false,
 			region: {
@@ -266,6 +274,9 @@ export default {
 		presellChange(e){
 			this.form.presell = e.target.value ? 1 : 0
 		},
+		isHdChange(e){
+			this.form.isHd = e.target.value ? 0 : 1
+		},
 		showStockChange(e){
 			this.form.showStock = e.target.value ? 1 : 0
 		},

+ 3 - 1
hdApp/src/admin/billing/affirmGhs.vue

@@ -28,7 +28,7 @@
 										</text>
 									</view>
 
-									<view style="text-align:right;">
+									<view style="text-align:right;position:relative;">
 										<view class="open-bx" >
 											<text class="num">
 												<text v-if="item.bigCount > 0" style="font-size:30upx;font-weight:bold;color:#3385ff;">
@@ -40,6 +40,7 @@
 											</text>
 										</view>
 									</view>
+									<text v-if="item.presell == 1" style="position:absolute;top:86upx;font-weight:bold;color:red;font-size:29upx;">预售花材下单不能退款!</text>
 								</view>
 							</view>
 						</view>
@@ -626,6 +627,7 @@ export default {
 						height: 140upx;
 					}
 					.item-info {
+						position: relative;
 						display: flex;
 						flex-direction: column;
 						justify-content: center;