联调优化

pages.json

@@ -178,7 +178,7 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-	    "color": "#333333",
+	    "color": "#999999",
 	    "selectedColor": "#1998FE",
 	    "borderStyle": "black",
 	    "backgroundColor": "#ffffff",

pages/goodsDetail/index.vue

@@ -53,13 +53,17 @@
 					<rich-text :nodes="formatRichText(goods_detail.know)"></rich-text>
 					<!-- <image class="goods-img" :src="item" v-for="(item, index) in goods_detail.content" :key="index" v-if="goods_detail.content_type == 'img'"></image> -->
 				</view> 
+				<view class="goods-detail" v-if="goods_detail.content">
+					<view class="lf-font-32 lf-font-bold lf-m-b-20">商品详情</view>
+					<rich-text :nodes="formatRichText(goods_detail.content)"></rich-text>
+				</view> 
 				<!-- 修饰专用 -->
 				<view class="extra"></view>
 				<!-- 吸底操作按钮 -->
 				<view class="lf-row-between fixed-bottom">
 					<view class="lf-flex lf-p-t-10 lf-p-b-10">
 						<view class="lf-flex-column lf-row-center icon-item" @click="$url('/pages/index/index', {type: 'switch'})">
-							<image class="icon-img" src="../../static/tabbar/home.png"></image>
+							<image class="icon-img" src="../../static/tabbar/home1.png"></image>
 							<view class="lf-m-t-1">首页</view>
 						</view>
 						<button class="lf-flex-column lf-row-center icon-item" open-type="contact">

pages/order/confirm_order.vue

@@ -2,10 +2,10 @@
 	<view v-if="$isRight(goods_details)">
 		<view class="lf-bg-white lf-p-t-30 lf-p-b-30 lf-p-l-32 lf-p-r-32">
 			<view class="lf-row-between">
-				<image :src="goods_details.product.picture" mode="aspectFill" style="width: 240rpx; height: 240rpx;border-radius: 20rpx;"></image>
+				<image :src="goods_details.picture" mode="aspectFill" style="width: 240rpx; height: 240rpx;border-radius: 20rpx;"></image>
 				<view class="flex-sub padding-left-sm">
 					<view class="bref-box lf-font-32 lf-color-333 lf-line-2" style="height: 88rpx;line-height: 44rpx;">
-						{{goods_details.product.title}}
+						{{goods_details.title}}
 					</view>
 					<view class="flex lf-m-t-25 align-center text-center">
 						<text class="block lf-color-gray lf-font-24" style="line-height: 40rpx;">数量</text>
@@ -146,7 +146,7 @@
 			getGoodsData(type){
 				this.$http(this.API.API_CONFIRMDETAILS,{id: this.goods_id,num: 1,pay_type: type}).then(res => {
 					this.goods_details = res.data;
-					console.log(res)
+					console.log('数据',res)
 				})
 			},
 			submit() {

pages/order/order_details.vue

@@ -34,11 +34,11 @@
 						<text class="text-orange lf-font-28" @click="copy(orderDetails.order_no)">复制</text>
 					</view>
 				</view>
-				<view class="cu-bar padding-lr solid-bottom">
+				<view class="cu-bar padding-lr solid-bottom" v-if="orderDetails.created_at">
 					<text class="lf-color-555 lf-font-28">下单时间</text>
 					<text class="lf-font-28 text-black1">{{ orderDetails.created_at }}</text>
 				</view>
-				<view class="cu-bar padding-lr solid-bottom">
+				<view class="cu-bar padding-lr solid-bottom" v-if="orderDetails.paid_at">
 					<text class="lf-color-555 lf-font-28">付款时间</text>
 					<text class="lf-font-28 text-black1" v-if="orderDetails.paid_at == 0">暂未付款</text>
 					<text class="lf-font-28 text-black1" v-else>{{ orderDetails.paid_at }}</text>