app 采购模式

ghsApp/src/pagesOrder/detail.vue

@@ -156,7 +156,7 @@
 						<div class="detail-price_box" style="font-size: 28upx">¥{{ parseFloat(detailInfo.sendCost) }}</div>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" v-if="detailInfo.labourCost > 0" :hover="false">
-						<div class="tui-title">人工资材</div>
+						<div class="tui-title">人工资材费</div>
 						<div class="detail-price_box" style="font-size: 28upx">¥{{ parseFloat(detailInfo.labourCost) }}</div>
 					</tui-list-cell>
 					<tui-list-cell v-if="detailInfo.discountAmount > 0" class="line-cell" :hover="false">

ghsApp/src/pagesPurchase/details.vue

@@ -45,19 +45,19 @@
 						<view v-else>{{ form.entryTime || "默认今天" }}</view>
 					</tui-list-cell>
 
-					<tui-list-cell v-if="getLoginInfo.cgModel == 0" class="line-cell" :hover="false">
+					<tui-list-cell v-if="myShopInfo.cgModel == 0" class="line-cell" :hover="false">
 						<view class="tui-title ">打包费</view>
 						<input type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.packingCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写"/>
 					</tui-list-cell>
 
-					<tui-list-cell v-if="getLoginInfo.cgModel == 0" class="line-cell" :hover="false" :arrow="false">
+					<tui-list-cell v-if="myShopInfo.cgModel == 0" class="line-cell" :hover="false" :arrow="false">
 						<view class="tui-title">运费支付</view>
 						<button @click="changeYfPayWay(1)" class="admin-button-com mini-btn" :class="form.yfPayWay == 1 ? 'blue' : 'default'">寄付</button>
 						<button @click="changeYfPayWay(2)" class="admin-button-com mini-btn" :class="form.yfPayWay == 2 ? 'blue' : 'default'" style="margin-left:20upx;">到付</button>
 					</tui-list-cell>
 				</view>
 
-				<view v-if="getLoginInfo.cgModel == 0" class="module-com input-line-wrap">
+				<view v-if="myShopInfo.cgModel == 0" class="module-com input-line-wrap">
 
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">短途运费</view>
@@ -70,7 +70,7 @@
 
 				</view>
 
-				<view v-if="getLoginInfo.cgModel == 0" class="module-com input-line-wrap">
+				<view v-if="myShopInfo.cgModel == 0" class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">提货费</view>
 						<input  type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.pickCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写"/>
@@ -104,7 +104,7 @@
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">每公斤运费</view>
-						<view v-if="getLoginInfo.cgModel == 0">{{perKgFreight}}</view>
+						<view v-if="myShopInfo.cgModel == 0">{{perKgFreight}}</view>
 						<input v-else style="border: 1upx solid #eee;color: #3385FF;width: calc(100%);height:70upx;"  type="digit" :disabled="!canIEdit"  @focus="form.avgKgWeight=''" v-model="form.avgKgWeight" placeholder-class="phcolor" class="tui-input" name="avgKgWeight" placeholder="请输入每公斤的运费成本"/>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
@@ -179,7 +179,7 @@ export default {
 		if(!this.$util.isEmpty(option.ghsId)){
 			this.selectJobId = option.ghsId
 		}
-		if(this.getLoginInfo.cgModel == 1){
+		if(this.myShopInfo.cgModel == 1){
 			this.form.avgKgWeight = this.myShopInfo.cgPerCost
 		}
 		this.initData();
@@ -335,7 +335,7 @@ export default {
 			if (!this.getMerchantInfo) {
 				await this.initMerchantInfo()
 			}
-			const res = await createPurchaseOrderApi({...formData,modifyPrice:this.modifyPrice,cgModel:this.getLoginInfo.cgModel})
+			const res = await createPurchaseOrderApi({...formData,modifyPrice:this.modifyPrice,cgModel:this.myShopInfo.cgModel})
 			uni.setStorageSync('flowersItemInfo', itemInfo)
 			this.removeFromSaveDirect()
 			this.$util.pageTo({url: "/pagesPurchase/components/pageSuccess",type:2,query: {orderSn: res.data.orderSn}})