From bcd8b848ba894266f6294fc53bded86e11417520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Mon, 11 Oct 2021 17:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B4=BB=E5=8A=A8=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=E6=8C=89=E9=92=AE=EF=BC=8C=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E8=BF=90=E8=B4=B9=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/activity/detail.vue      | 21 +++++++++++++--------
 pages/order/newdetail/newdetail.vue  | 16 ++++++++++++----
 pages/order/pointconfirm/confirm.vue |  2 +-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/pages/index/activity/detail.vue b/pages/index/activity/detail.vue
index 8d4663f..ba0b4d5 100644
--- a/pages/index/activity/detail.vue
+++ b/pages/index/activity/detail.vue
@@ -33,18 +33,16 @@
 					<view>{{activity_details.rule}}</view>
 				</view>
 			</view>
-			<button v-if="enter_type==0" class="btn" 
+			
+			<button v-if="$isRight(activity_details.apply)" class="btn lf-opacity" :disabled="true">
+				已经报名
+			</button>
+			<button v-else-if="enter_type == 0" class="btn"
 				hover-class="lf-opacity" 
 				:disabled="is_end" 
 				:class="{'lf-opacity': is_end}"
 				@click="submit">{{ is_end ? '名额已满' : '立即报名' }}
 			</button>
-			
-			<button v-if="activity_details.apply != null" class="btn lf-opacity"
-				:disabled="true" 
-				>
-				已经报名
-			</button>
 		</view>
 	</view>
 </template>
@@ -56,7 +54,8 @@
 				is_end: false ,// 是否可报名，false为活动为结束可报名，否则不可报名
 				activity_id: 0,
 				activity_details: '',
-				enter_type: 0
+				enter_type: 0,
+				show_count: 0
 			}
 		},
 		onLoad(e){
@@ -70,6 +69,12 @@
 			console.log('传来的type',this.is_end);
 			this.getActivityDetails();
 		},
+		onShow(){
+			this.show_count++;
+			if(this.show_count > 1){
+				this.getActivityDetails();
+			}
+		},
 		methods: {
 			getActivityDetails() {
 				this.$http
diff --git a/pages/order/newdetail/newdetail.vue b/pages/order/newdetail/newdetail.vue
index caf935b..1076848 100644
--- a/pages/order/newdetail/newdetail.vue
+++ b/pages/order/newdetail/newdetail.vue
@@ -56,13 +56,13 @@
 			</view>
 		</view>
 		<view class="card goods">
-			<view>
+			<view @click="$url('/pages/shop/shopdetail?id='+ order_details.brand.id)">
 				<text class="lf-iconfont icon-Group- lf-font-30"></text>
 				<text class="shop-name">{{order_details.brand.name}}</text>
 				<text class="lf-iconfont icon-xiangyou lf-font-24"></text>
 			</view>
 			<view class="lf-flex lf-m-t-20" v-for="(item,index) of order_details.items" :key="index">
-				<image class="goods-img" :src="item.item_meta.image"></image>
+				<image class="goods-img" :src="item.item_meta.image" @click="$url('/pages/shop/goodsdetail?id='+ item.item_meta.detail_id)"></image>
 				<view class="info">
 					<view class="lf-font-26 lf-color-333 lf-line-1">{{item.item_name}}</view>
 					<view class="lf-font-24 lf-color-777">{{item.item_meta.specs_text}}</view>
@@ -87,11 +87,11 @@
 			</view>
 			<view class="lf-row-between lf-m-t-30 lf-font-28">
 				<text class="lf-color-777">应付运费</text>
-				<text class="lf-color-222">+¥{{order_details.payable_freight}}</text>
+				<text class="lf-color-222">¥{{unitConversion(order_details.payable_freight)}}</text>
 			</view>
 			<view class="lf-row-between lf-m-t-30 lf-font-28">
 				<text class="lf-color-777">实付运费</text>
-				<text class="lf-color-222">+¥{{order_details.real_freight}}</text>
+				<text class="lf-color-222">¥{{unitConversion(order_details.real_freight)}}</text>
 			</view>
 		</view>
 		<view class="card" v-if="type == 'default'">
@@ -216,6 +216,7 @@
 <script>
 	import lfQrcode from '@/components/lf-code/lf-qrcode.vue';
 	import countdownTime from '@/components/uni-countdown/uni-countdown.vue';
+	import Bigc from '@/common/js/bigc.js';
 	export default {
 		data() {
 			return {
@@ -256,6 +257,13 @@
 			countdownTime,
 			lfQrcode
 		},
+		computed: {
+			unitConversion(){
+				return function(val){
+					return new Bigc(val).div(100);
+				}
+			}
+		},
 		onLoad(options) {
 			this.type = options.type || this.type;
 			this.order_no = options.order_id;
diff --git a/pages/order/pointconfirm/confirm.vue b/pages/order/pointconfirm/confirm.vue
index c7306d7..40b0734 100644
--- a/pages/order/pointconfirm/confirm.vue
+++ b/pages/order/pointconfirm/confirm.vue
@@ -84,7 +84,7 @@
 					<view class="lf-flex">
 						<!-- <view class="lf-font-32 lf-color-primary" style="max-width: 400rpx;">合计 ¥{{ order_detail.order.total_yuan }}</view> -->
 						<view class="lf-font-32 lf-color-primary" style="max-width: 400rpx;">
-							<text class="lf-m-r-10">运费: ￥{{order_detail.order.payable_freight_yuan}}</text> 
+							<!-- <text class="lf-m-r-10">运费: ￥{{order_detail.order.payable_freight_yuan}}</text> -->
 							<text>积分: {{order_detail.order.redeem_point}}积分</text> 
 						</view>
 						<view class="confirm-btn" hover-class="lf-opacity" @click="confirm">立即兑换</view>