Merge commit '4423c7cc'

pages/logistics/logistics.vue

@@ -63,7 +63,7 @@
 							<text v-if="data.deliverystatus === '5'" class="item_status">疑难件</text>
 							<text v-if="data.deliverystatus === '6'" class="item_status">退件签收</text>
 						</text>
-						<text class="item_detail">{{item.status}}</text>
+						<text class="item_detail" v-html="item.status"></text>
 					</view>
 				</view>
 			</view>
@@ -82,7 +82,7 @@
 			</view>
 			<view class="recommend_list">
 				<view v-for="(item, index) in recommend_goods" :key="index" class="recomment_item">
-					<image :src="item.default_image" @click="$jumpGoodDetail(item.goods_id)"></image>
+					<image :src="item.default_image || $noGoodsImg" @click="$jumpGoodDetail(item.goods_id)"></image>
 					<view class="recomment_goods_name">{{item.goods_name}}</view>
 					<view class="recommend_flex">
 						<text class="symbol">￥<text class="price">{{item.price}}</text></text>
@@ -125,9 +125,18 @@
 					no: num
 				},
 				dataType: 'json',
-				success: (res) => {
-					this.data = res.data.data.result;
-					this.address = res.data.data.address;
+				success: (res) => {
+					if(res.data.data.result) {
+						// #ifdef H5
+						if(res.data.data.result.deliverystatus === '2' || res.data.data.result.deliverystatus === '3' || res.data.data.result.deliverystatus === '4') {
+							let reg = /(\d{11})/g,
+								str = res.data.data.result.list[0]['status'];
+							res.data.data.result.list[0]['status'] = str.replace(reg,`<a style="color:red;" href="tel:${"$1"}">${"$1"}</a>`);
+						}
+						// #endif
+						this.data = res.data.data.result;
+						this.address = res.data.data.address;
+					}
 					this.recommend_goods = res.data.data.recommend_goods;
 					this.isLogin = res.data.data.login_flg;
 				}