外采

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -4,7 +4,7 @@
 			<view class="top-view"> </view>
 			<view class="result-view">
 				<view class="iconfont iconchenggong"></view>
-				<view class="result-title" v-if="info.status == 3">草稿已保存，请点下面确认入库</view>
+				<view class="result-title" v-if="info.status == 3">已保存，请按以下完成入库</view>
 				<view class="result-title" v-else>提交成功</view>
 <template>
 	<view style="width:670upx;overflow:hidden;padding-left:50upx;">

ghsApp/src/pagesPurchase/details.vue

@@ -46,7 +46,7 @@
 						<AppDatePicker v-if="canIEdit" :dateVal.sync="form.entryTime" :placeholder="'今天'"/>
 						<view v-else>{{ form.entryTime || "默认今天" }}</view>
 					</tui-list-cell>
-
+<block v-if="location == 0">
 					<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="请填写"/>
@@ -57,8 +57,10 @@
 						<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>
+</block>
 				</view>
 
+<block v-if="location == 0">
 				<view v-if="myShopInfo.cgModel == 0" class="module-com input-line-wrap">
 
 					<tui-list-cell class="line-cell" :hover="false">
@@ -82,7 +84,7 @@
 						<input  type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.localCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写"/>
 					</tui-list-cell>
 				</view>
-
+</block>
 				<view class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">总金额</view>
@@ -96,6 +98,7 @@
 						<view class="tui-title ">减免</view>
 						<view>{{(totalPrice - modifyPrice).toFixed(2) }}</view>
 					</tui-list-cell>
+<block v-if="location == 0">
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">总运费</view>
 						<view>{{totalFreight}}</view>
@@ -109,6 +112,7 @@
 						<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>
+</block>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title">备注</view>
 						<view class="tui-input">

ghsApp/src/pagesPurchase/supplier.vue

@@ -17,6 +17,10 @@
         <block v-if="!$util.isEmpty(supplierList)">
           <view class="list_item" v-for="(item, index) in supplierList" :key="index" @click="goToCg(item)" >
 
+<view v-if="item.location == 1"
+ style="width:90upx;padding:6upx 0 6upx 0;font-size:22upx;background-color:#7babc1;color:white;position:absolute;left:0;top:0;text-align:center;"
+>附近</view>
+
             <view class="store_name">
               <image :src="item.avatar"></image>
               <view class="store_title">{{item.name}}</view>