运费管理

hdApp/src/admin/billing/affirmGhs.vue

@@ -65,6 +65,21 @@
 		<button class="admin-button-com middle" :class="[form.transType == 2 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;" @click="changeTransType(2)">冷链物流</button>
 		<button class="admin-button-com middle" :class="[form.transType == 3 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;" @click="changeTransType(3)">航空物流</button>
 	</tui-list-cell>
+
+	<tui-list-cell class="line-cell" :hover="false" :arrow="false">
+	<view>
+		<view v-if="form.transType == 0 || form.transType == 1">
+			<text style="color:red;width:100%;font-weight:bold;">提供送货上门</text>
+		</view>
+		<view v-if="form.transType == 2 || form.transType == 3">
+			<text style="color:red;width:100%;font-weight:bold;">提货需要自理</text>
+		</view>
+		<view>
+			<text style="color:#3385FF;width:100%;font-weight:bold;">运费预收，根据实际产生物流费用，多退少补。如有退款则原路退回。</text>
+		</view>
+	</view>
+	</tui-list-cell>
+
 </block>
 <block v-else>
 	<tui-list-cell class="line-cell" :hover="false" :arrow="false" >

hdApp/src/admin/billing/affirmGhsBook.vue

@@ -56,6 +56,19 @@
 		<button class="admin-button-com middle" :class="[form.transType == 2 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;" @click="changeTransType(2)">冷链物流</button>
 		<button class="admin-button-com middle" :class="[form.transType == 3 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;" @click="changeTransType(3)">航空物流</button>
 	</tui-list-cell>
+	<tui-list-cell class="line-cell" :hover="false" :arrow="false">
+	<view>
+		<view v-if="form.transType == 0 || form.transType == 1">
+			<text style="color:red;width:100%;font-weight:bold;">提供送货上门</text>
+		</view>
+		<view v-if="form.transType == 2 || form.transType == 3">
+			<text style="color:red;width:100%;font-weight:bold;">提货需要自理</text>
+		</view>
+		<view>
+			<text style="color:#3385FF;width:100%;font-weight:bold;">鲜花和运费都是预收，根据实际费用，多退少补。如有退款则原路退回。</text>
+		</view>
+	</view>
+	</tui-list-cell>
 </block>
 <block v-else>
 	<tui-list-cell class="line-cell" :hover="false" :arrow="false" >

hdApp/src/pages.json

@@ -424,6 +424,7 @@
 				{ "path": "bookExplain", "style": { "navigationBarTitleText": "预订说明", "enablePullDownRefresh": true } },
 				{ "path": "refundList","style": {"navigationBarTitleText": "退款记录", "enablePullDownRefresh": true } },
 				{ "path": "readMe","style": {"navigationBarTitleText": "购买须知", "enablePullDownRefresh": true } },
+				{ "path": "bookReadMe","style": {"navigationBarTitleText": "预订须知", "enablePullDownRefresh": true } },
 				{ "path": "addCg","style": {"navigationBarTitleText": "新增采购", "enablePullDownRefresh": false } },
 				{ "path": "addCgConfirm","style": {"navigationBarTitleText": "确认订单", "enablePullDownRefresh": false } },
 				{ "path": "addCgResult","style": {"navigationBarTitleText": "结果", "enablePullDownRefresh": false } }

hdApp/src/pagesPurchase/bookProduct.vue

@@ -14,7 +14,7 @@
 				</view>
 			</view>
 			<view>
-			<image v-if="buyNotice == 1" :src="`${constant.imgUrl}/cg/buy_look2.png`" @click.stop="getReadMe(ghsInfo)" style="border-radius:10upx;margin-top:9upx;" mode="widthFix"></image>
+			<image v-if="buyNotice == 1" :src="`${constant.imgUrl}/cg/bookReadMe.png?v=1`" @click.stop="getReadMe(ghsInfo)" style="border-radius:10upx;margin-top:9upx;" mode="widthFix"></image>
 			</view>
 		</view>
 		<view class="input-wrap" >
@@ -325,7 +325,7 @@ export default {
 	},
 	methods: {
 		getReadMe(info){
-			this.$util.pageTo({url:'/pagesPurchase/readMe?shopId='+info.shopId})
+			this.$util.pageTo({url:'/pagesPurchase/bookReadMe?shopId='+info.shopId})
 		},
 		changeClass(index){
 			this.$refs.selectFlowerNumRef.close()

hdApp/src/pagesPurchase/bookReadMe.vue

@@ -0,0 +1,79 @@
+<template>
+	<view class="app-content">
+		<view class="list">
+			<view>
+				<image mode="widthFix" :src="`${constant.imgUrl}/ghs/a_hr_before.jpg?v=3`" style="widht:100%;"></image>
+			</view>
+            <view>
+				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after1.jpg?v=3`" mode="widthFix"></image>
+				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after2.jpg?v=3`" mode="widthFix"></image>
+			</view>
+		</view>
+		<view style="text-align:center;margin-top:40upx;">
+			<button class="admin-button-com big default go-back" style="width:260upx;" @click="goBack()">返回</button>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	name: "book-what",
+	components: {
+	},
+	mixins: [],
+	data() {
+		return {
+			shopId:0
+		};
+	},
+	onLoad(){
+		this.shopId = this.option.shopId
+	},
+	methods: {
+		init(){
+
+		},
+		goBack(){
+			uni.navigateBack()
+		},
+		toPhone(phone){
+			uni.makePhoneCall({ phoneNumber: phone })
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.app-content{
+	padding:20upx 20upx 60upx 20upx;
+	background-color: white;
+    .title{
+		font-weight: bold;
+		font-size:36upx;
+		margin-bottom:22upx;
+	}
+	.smallTitle{
+		font-weight: bold;
+		font-size:30upx;
+		font-weight: bold;
+		margin:25upx 0 25upx 0;
+	}
+	.info{
+    	font-size:32upx;
+		margin-bottom:20upx;
+	}
+	.image{
+		width:100%;
+		margin-bottom:20upx;
+	}
+	.video{
+		margin:0 auto;
+        text-align: center;
+		margin-bottom:10upx;
+	}
+	.book-button{
+		margin-bottom:15upx;
+	}
+	.go-back{
+		margin:0 auto;
+	}
+}
+</style>

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -14,7 +14,7 @@
 				</view>
 			</view>
 			<view>
-			<image v-if="buyNotice == 1" :src="`${constant.imgUrl}/cg/buy_look2.png`" @click.stop="getReadMe(ghsInfo)" style="border-radius:10upx;margin-top:9upx;" mode="widthFix"></image>
+			<image v-if="buyNotice == 1" :src="`${constant.imgUrl}/cg/buy_look2.png?v=1`" @click.stop="getReadMe(ghsInfo)" style="border-radius:10upx;margin-top:9upx;" mode="widthFix"></image>
 			</view>
 		</view>
 

hdApp/src/pagesPurchase/readMe.vue

@@ -1,6 +1,32 @@
 <template>
 	<view class="app-content">
-
+		<view class="list" v-if="shopId == 36523">
+			<view>
+				<image mode="widthFix" :src="`${constant.imgUrl}/ghs/a_hr_before.jpg?v=3`" style="widht:100%;"></image>
+			</view>
+            <view>
+				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after1.jpg?v=3`" mode="widthFix"></image>
+				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after2.jpg?v=3`" mode="widthFix"></image>
+			</view>
+		</view>
+		<view class="list" v-if="shopId == 8345">
+			<view>
+				<image mode="widthFix" :src="`${constant.imgUrl}/ghs/a_hr_before.jpg?v=3`" style="widht:100%;"></image>
+			</view>
+            <view>
+				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after1.jpg?v=3`" mode="widthFix"></image>
+				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after2.jpg?v=3`" mode="widthFix"></image>
+			</view>
+		</view>
+		<view class="list" v-if="shopId == 8249">
+			<view>
+				<image mode="widthFix" :src="`${constant.imgUrl}/ghs/a_hr_before.jpg?v=3`" style="widht:100%;"></image>
+			</view>
+            <view>
+				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after1.jpg?v=3`" mode="widthFix"></image>
+				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after2.jpg?v=3`" mode="widthFix"></image>
+			</view>
+		</view>
 		<view class="list" v-if="shopId == 1421">
 			<view>
 				<image mode="widthFix" :src="`${constant.imgUrl}/ghs/ttxhjm.jpg`" style="widht:100%;"></image>
@@ -115,6 +141,7 @@ export default {
 <style lang="scss" scoped>
 .app-content{
 	padding:20upx 20upx 60upx 20upx;
+	background-color: white;
     .title{
 		font-weight: bold;
 		font-size:36upx;