shish пре 1 година
родитељ
комит
871e2d5d94

+ 3 - 5
hdApp/src/admin/billing/affirm.vue

@@ -115,8 +115,8 @@
 
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 						<view class="tui-title">结账方式</view>
 						<view class="tui-title">结账方式</view>
-						<button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
             <button @click="form.hasPay = 0" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'">扫码付</button>
             <button @click="form.hasPay = 0" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'">扫码付</button>
+						<button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
 						<button @click="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">赊账</button>
 						<button @click="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">赊账</button>
 					</tui-list-cell>
 					</tui-list-cell>
 
 
@@ -191,9 +191,7 @@
         </text>
         </text>
         <text class="price-number"><text class="large">¥{{ modifyPrice }}</text></text>
         <text class="price-number"><text class="large">¥{{ modifyPrice }}</text></text>
       </view>
       </view>
-      <text style="font-size:30upx;right:100upx;">
-      当前在
-      <text style="font-weight:bold;color:red;margin-left:5upx;font-size:32upx;">{{currentShop.shopName}}</text></text>
+      <!-- <text style="font-size:30upx;right:100upx;">当前在<text style="font-weight:bold;color:red;margin-left:5upx;font-size:32upx;">{{currentShop.shopName}}</text></text> -->
       <button class="admin-button-com blue big" @click="confirmSubmit">提交</button>
       <button class="admin-button-com blue big" @click="confirmSubmit">提交</button>
     </view>
     </view>
 
 
@@ -347,7 +345,7 @@ export default {
     }
     }
 
 
     //默认欠款是首选项
     //默认欠款是首选项
-    this.form.hasPay = 1
+    this.form.hasPay = 0
     // #ifdef APP-PLUS
     // #ifdef APP-PLUS
     if(this.$util.isScanEnv()){
     if(this.$util.isScanEnv()){
       this.isScanEnv = true
       this.isScanEnv = true

+ 1 - 1
hdApp/src/admin/item/components/item2.vue

@@ -60,7 +60,7 @@
 	</view>
 	</view>
 	<text class="bottom-button" @click.stop="moreAction(info)">更多</text>
 	<text class="bottom-button" @click.stop="moreAction(info)">更多</text>
 	<text class="bottom-button" @click.stop="goToStockDetail(info)">库明细</text>
 	<text class="bottom-button" @click.stop="goToStockDetail(info)">库明细</text>
-	<text class="bottom-button" @click.stop="hideChangeFn(info)">{{ frontHide == 0 ? '隐藏' : '显示' }}</text>
+	<!-- <text class="bottom-button" @click.stop="hideChangeFn(info)">{{ frontHide == 0 ? '隐藏' : '显示' }}</text> -->
 	<text class="bottom-button" @click.stop="doPrintLabel(info,0)">标签</text>
 	<text class="bottom-button" @click.stop="doPrintLabel(info,0)">标签</text>
 	<text class="bottom-button" @click.stop="doPrintLabel(info,1)">价码</text>
 	<text class="bottom-button" @click.stop="doPrintLabel(info,1)">价码</text>
 </view>
 </view>

+ 8 - 8
hdApp/src/admin/item/list2.vue

@@ -107,20 +107,20 @@
 			<view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
 			<view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
 				<view style="width:100vw;"><button @click="costChange()">成本变动记录</button></view>
 				<view style="width:100vw;"><button @click="costChange()">成本变动记录</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="priceChange()">价格变动记录</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="priceChange()">价格变动记录</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="varietyManage()">多颜色</button></view>
+				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="varietyManage()">多颜色</button></view> -->
 				<view style="width:100vw;margin-top:8upx;"><button @click="copyCreate()">复制新建</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="copyCreate()">复制新建</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="moveToLose()">挪到处理区</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="shareItem()">打开分享(批发)</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="getHdPosterFn()">分享海报(批发)</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="getSkPosterFn()">分享海报(零售)</button></view>
+				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="moveToLose()">挪到处理区</button></view> -->
+				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="shareItem()">打开分享(批发)</button></view> -->
+				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="getHdPosterFn()">分享海报(批发)</button></view> -->
+				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="getSkPosterFn()">分享海报</button></view> -->
 				<view style="width:100vw;margin-top:8upx;"><button @click="orderRecord()">下单记录</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="orderRecord()">下单记录</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="onStockChange()">路上库存变动</button></view>
+				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="onStockChange()">路上库存变动</button></view> -->
 				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="ptAuth()">申请平台认证</button></view> -->
 				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="ptAuth()">申请平台认证</button></view> -->
-				<view style="width:100vw;margin-top:8upx;"><button @click="preSell()">预售</button></view>
+				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="preSell()">预售</button></view> -->
 				<view style="width:100vw;margin-top:8upx;"><button @click="doWaste()">报损</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="doWaste()">报损</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="doPart()">拆散</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="doPart()">拆散</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="delItem()">删除</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="delItem()">删除</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="sendStock()">分配库存</button></view>
+				<!-- <view style="width:100vw;margin-top:8upx;"><button @click="sendStock()">分配库存</button></view> -->
 				<view style="width:100vw;margin-top:30upx;"><button @click="closeRightShow()">取消</button></view>
 				<view style="width:100vw;margin-top:30upx;"><button @click="closeRightShow()">取消</button></view>
 			</view>
 			</view>
 		</uni-popup>
 		</uni-popup>