shish 3 ani în urmă
părinte
comite
e1bc7b02c6
2 a modificat fișierele cu 3 adăugiri și 3 ștergeri
  1. 1 1
      ghsApp/src/admin/billing/index.vue
  2. 2 2
      ghsApp/src/pagesOrder/detail.vue

+ 1 - 1
ghsApp/src/admin/billing/index.vue

@@ -89,7 +89,7 @@
 						<image @click="switchGlobalUnitType" :src="`${constant.imgUrl}/icon/switch/switch128.png`" 
 						<image @click="switchGlobalUnitType" :src="`${constant.imgUrl}/icon/switch/switch128.png`" 
 						style="width:86upx;height:86upx;position:absolute;top:300upx;right:40upx;" mode="widthFix"></image>
 						style="width:86upx;height:86upx;position:absolute;top:300upx;right:40upx;" mode="widthFix"></image>
 
 
-						<button class="admin-button-com mini-btn" @click="customData.userPrice=0.01" style="position:absolute;top:200upx;right:33upx;">赠送</button>
+						<button class="admin-button-com mini-btn" @click="customData.userPrice=0.01;customData.bigCount=1" style="position:absolute;top:200upx;right:33upx;">赠送</button>
 
 
 					</view>
 					</view>
 				</view>
 				</view>

+ 2 - 2
ghsApp/src/pagesOrder/detail.vue

@@ -126,8 +126,8 @@
 						<view v-for="(s, idx) in detailInfo.product" :key="idx" class="commodity-item" style="position:relative;">
 						<view v-for="(s, idx) in detailInfo.product" :key="idx" class="commodity-item" style="position:relative;">
 							<image class="item-icon" :src="s.cover" @click.stop="previewImage(s.bigCover)" />
 							<image class="item-icon" :src="s.cover" @click.stop="previewImage(s.bigCover)" />
 							<button v-if="s.xhUnitType == 1" style="position:absolute;left:16upx;" class="admin-button-com blue mini-btn" @click="partOne(s)">拆1份</button>
 							<button v-if="s.xhUnitType == 1" style="position:absolute;left:16upx;" class="admin-button-com blue mini-btn" @click="partOne(s)">拆1份</button>
-							<button style="position:absolute;left:155upx;top:78upx;" class="admin-button-com mini-btn" @click="giveItemFn(s)">发起赠送</button>
-							<text v-if="s.giveNum && Number(s.giveNum)>0" style="position:absolute;left:320upx;top:90upx;color:#333333;">已赠 {{parseFloat(s.giveNum)}}<text v-if="s.xhUnitType == 0">{{s.xhUnitName}}</text></text>
+							<button style="position:absolute;left:155upx;top:93upx;border:0upx solid #CCCCCC;padding:0upx;" class="admin-button-com mini-btn" @click="giveItemFn(s)">发起赠送</button>
+							<text v-if="s.giveNum && Number(s.giveNum)>0" style="position:absolute;left:290upx;top:90upx;color:#333333;">已赠 {{parseFloat(s.giveNum)}}<text v-if="s.xhUnitType == 0">{{s.xhUnitName}}</text></text>
 							<view class="item-info" @click="pageTo({url:'/admin/item/detail',query:{id: s.productId}})">
 							<view class="item-info" @click="pageTo({url:'/admin/item/detail',query:{id: s.productId}})">
 								<view class="info-line">
 								<view class="info-line">
 									<text class="item-name">{{ s.name }}</text>
 									<text class="item-name">{{ s.name }}</text>