修改价格下划线，解决海报页中图片滑动卡死问题，虚拟商品多劵码展示

app.json

@@ -101,6 +101,8 @@
     "pages/address-picker/address-picker",
     "pages/test/test",
     "pages/test/index",
+    "pages/test/yangzhong",
+    "pages/test/cxj",
     "pages/favorite/favorite",
     "pages/order-refund/order-refund",
     "pages/order-refund-detail/order-refund-detail",

components/common/index.wxml

@@ -232,6 +232,7 @@
 													<view class='flex-row' style='padding:10rpx 20rpx'>
 														<view class='flex-grow-1' style='color:#ff4544'>
 															<block wx:if='{{goods.is_negotiable != 1}}'>￥</block>{{goods.price}}
+															<text class="promotion-price" style="text-decoration:line-through; color: #ccc; font-size: 24rpx;padding-left: 10rpx;">{{goods.original_price}}</text>
 														</view>
 														<block wx:if='{{__is_sales}}'>
 															<view class='fs-sm flex-y-center' style='color:#999999;'>已售{{goods.sales}}</view>

components/goods/goods_info.wxml

@@ -76,9 +76,9 @@
 						</block>
 						<block wx:if='{{ (!(goods.is_negotiable) && pageType !== "STEP") }}'><text class='renminbi {{( (__user_info.level != - 1 || goods.is_level === false) ?"is_member":"")}}'>￥</text><text class='min_price {{( (__user_info.level != - 1 || goods.is_level === false) ?"is_member":"")}}'>{{(goods.min_price > 0?goods.min_price:goods.price)}}</text></block>
 						<block wx:else><text class='min_price'>{{goods.min_price}}</text></block>
-						<block>
+				<!-- 		<block>
 							<text class="promotion-price">{{goods.original_price}}</text>
-						</block>
+						</block> -->
 					</view>
 				</block>
 				<block wx:if='{{pageType !== "PINTUAN"}}'>

pages/coupon-detail/coupon-detail.wxml

@@ -9,6 +9,7 @@
 			<view style='padding:24rpx 24rpx 0 24rpx;'>
 				<view class='flex-col flex-y-center detail-head'>
 					<view style='color:#666666;'>{{list.name}}</view>
+					<view style='color:#666666;'>{{list.coupon.name}}</view>
 					<view style='color:#353535;font-weight:bold;font-size:25pt;padding:10rpx 0'>￥{{list.sub_price}}</view>
 					<view style='color:#353535;fs-b'>{{list.min_price_desc}}</view>
 					<block wx:if='{{list.is_receive == 0}}'>

pages/coupon-list/coupon-list.js

@@ -1 +1,68 @@
-var share_count=0;Page({data:{},onLoad:function(t){getApp().page.onLoad(this,t)},onShow:function(){getApp().page.onShow(this);var e=this;getApp().core.showLoading({mask:!0}),getApp().request({url:getApp().api.default.coupon_list,success:function(t){0==t.code&&e.setData({coupon_list:t.data.list})},complete:function(){getApp().core.hideLoading()}})},receive:function(t){var o=this,e=t.target.dataset.index;getApp().core.showLoading({mask:!0}),o.hideGetCoupon||(o.hideGetCoupon=function(t){var e=t.currentTarget.dataset.url||!1;o.setData({get_coupon_list:null}),e&&getApp().core.navigateTo({url:e})}),getApp().request({url:getApp().api.coupon.receive,data:{id:e},success:function(t){0==t.code&&o.setData({get_coupon_list:t.data.list,coupon_list:t.data.coupon_list})},complete:function(){getApp().core.hideLoading()}})},closeCouponBox:function(t){this.setData({get_coupon_list:""})},goodsList:function(t){var e=t.currentTarget.dataset.goods,o=[];for(var a in e)o.push(e[a].id);getApp().core.navigateTo({url:"/pages/list/list?goods_id="+o})}}); 
+var share_count = 0;
+Page({
+	data: {},
+	onLoad: function(t) {
+		this.setData({
+		   options: t
+		})
+		getApp().page.onLoad(this, t)
+	},
+	onShow: function() {
+		getApp().page.onShow(this);
+		var e = this;
+		getApp().core.showLoading({
+			mask: !0
+		}), getApp().request({
+			url: getApp().api.default.coupon_list + '&coupon_id=' + e.data.options.coupon_id ,
+			success: function(t) {
+				0 == t.code && e.setData({
+					coupon_list: t.data.list
+				})
+			},
+			complete: function() {
+				getApp().core.hideLoading()
+			}
+		})
+	},
+	receive: function(t) {
+		var o = this,
+			e = t.target.dataset.index;
+		getApp().core.showLoading({
+			mask: !0
+		}), o.hideGetCoupon || (o.hideGetCoupon = function(t) {
+			var e = t.currentTarget.dataset.url || !1;
+			o.setData({
+				get_coupon_list: null
+			}), e && getApp().core.navigateTo({
+				url: e
+			})
+		}), getApp().request({
+			url: getApp().api.coupon.receive,
+			data: {
+				id: e
+			},
+			success: function(t) {
+				0 == t.code && o.setData({
+					get_coupon_list: t.data.list,
+					coupon_list: t.data.coupon_list
+				})
+			},
+			complete: function() {
+				getApp().core.hideLoading()
+			}
+		})
+	},
+	closeCouponBox: function(t) {
+		this.setData({
+			get_coupon_list: ""
+		})
+	},
+	goodsList: function(t) {
+		var e = t.currentTarget.dataset.goods,
+			o = [];
+		for (var a in e) o.push(e[a].id);
+		getApp().core.navigateTo({
+			url: "/pages/list/list?goods_id=" + o
+		})
+	}
+});

pages/goods/goods.js

@@ -14,6 +14,7 @@ Page({
   data: {
     pageType: "STORE",
     id: null,
+    topic_id: null,
     goods: {},
     show_attr_picker: !1,
     form: {
@@ -45,9 +46,11 @@ Page({
     goodNumCount: 0
   },
   onLoad: function (t) {
+	console.log('传过来的数据',t)
     getApp().page.onLoad(this, t);
     var o = this;
-    share_count = 0, is_more_comment = !(is_loading_comment = !(p = 1));
+    share_count = 0, 
+	is_more_comment = !(is_loading_comment = !(p = 1));
     var e = t.quick;
     if (e) {
       var a = getApp().core.getStorageSync(getApp().const.ITEM);
@@ -76,14 +79,24 @@ Page({
       getApp().query = null, t.id = c.gid
     }
     o.setData({
-      id: t.id
-    }), o.getGoods(), o.getCommentList()
+      id: t.id,
+	  topic_id: t.topic_id
+    }), 
+	o.getGoods(), 
+	o.getCommentList()
   },
   onReady: function () {
     getApp().page.onReady(this)
   },
   onShow: function () {
-    getApp().page.onShow(this), shoppingCart.init(this), specificationsModel.init(this, shoppingCart), gSpecificationsModel.init(this), goodsBanner.init(this), goodsInfo.init(this), goodsBuy.init(this), goodsRecommend.init(this);
+    getApp().page.onShow(this), 
+	shoppingCart.init(this), 
+	specificationsModel.init(this, shoppingCart), 
+	gSpecificationsModel.init(this), 
+	goodsBanner.init(this), 
+	goodsInfo.init(this), 
+	goodsBuy.init(this), 
+	goodsRecommend.init(this);
     var t = getApp().core.getStorageSync(getApp().const.ITEM);
     if (t) var o = t.total,
       e = t.carGoods,
@@ -150,11 +163,20 @@ Page({
         })
       }
     }
+	let data = {}
+	if(n.data.topic_id == undefined || n.data.topic_id == null || n.data.topic_id == ''){
+		data = {
+			id: n.data.id
+		}
+	}else{
+		data = {
+			id: n.data.id,
+			topic_id: n.data.topic_id
+		}
+	}
     getApp().request({
       url: getApp().api.default.goods,
-      data: {
-        id: n.data.id
-      },
+      data: data,
       success: function (t) {
         if (0 == t.code) {
           var o = t.data.detail;

pages/new-order-submit/new-order-submit.js

@@ -18,7 +18,8 @@ Page({
         show_more: !1,
         index: -1,
         mch_offline: !0,
-        is_virtual: 0
+        is_virtual: 0, //虚拟商品
+		phone: '' //虚拟商品手机号
     },
     onLoad: function (t) {
         getApp().page.onLoad(this, t);
@@ -29,9 +30,19 @@ Page({
         }), is_loading_show = !1
     },
     bindContentInput: function (t) {
-        this.data.mch_list[t.currentTarget.dataset.index].content = t.detail.value, this.setData({
+        this.data.mch_list[t.currentTarget.dataset.index].content = t.detail.value, 
+		this.setData({
             mch_list: this.data.mch_list
         })
+    },
+	// 虚拟商品电话
+    bindMobileInput: function (t) {
+		console.log(t.detail.value)
+		console.log(t.currentTarget.dataset.index)
+        this.data.phone = t.detail.value, 
+		this.setData({
+            phone: this.data.phone
+        })
     },
     KeyName: function (t) {
         var e = this.data.mch_list;
@@ -81,6 +92,7 @@ Page({
         var e = this,
             a = {},
             i = e.data.mch_list;
+			console.log("data中的mch_list",i)
         for (var o in i) {
             var s = i[o].form;
             if (s && 1 == s.is_form && 0 == i[o].mch_id) {
@@ -95,11 +107,12 @@ Page({
                                 content: "请填写" + s.name + "，加‘*’为必填项",
                                 showCancel: !1
                             }), !1
-                        } else if (!n[r].default || null == n[r].default) return getApp().core.showModal({
-                    title: "提示",
-                    content: "请填写" + s.name + "，加‘*’为必填项",
-                    showCancel: !1
-                }), !1
+                        } else if (!n[r].default || null == n[r].default) 
+					return getApp().core.showModal({
+						title: "提示",
+						content: "请填写" + s.name + "，加‘*’为必填项",
+						showCancel: !1
+					}), !1
             }
             if (1 == i.length && 0 == i[o].mch_id && 1 == i[o].offline);
             else {
@@ -114,6 +127,15 @@ Page({
                 }
             }
         }
+		if(e.data.is_virtual == 1){
+			if(e.data.phone == '' || e.data.phone == null){
+				return getApp().core.showModal({
+					title: "提示",
+					content: "请填写电话号码",
+					showCancel: !1
+				}), !1;
+			}
+		}
         if (a.mch_list = JSON.stringify(i), 0 < e.data.pond_id) {
             if (0 < e.data.express_price && -1 == e.data.payment) return e.setData({
                 show_payment: !0
@@ -121,7 +143,12 @@ Page({
         } else if (-1 == e.data.payment) return e.setData({
             show_payment: !0
         }), !1;
-        1 == e.data.integral_radio ? a.use_integral = 1 : a.use_integral = 2, a.payment = e.data.payment, a.formId = t.detail.formId, e.order_submit(a, "s")
+        1 == e.data.integral_radio ? a.use_integral = 1 : a.use_integral = 2, 
+		a.payment = e.data.payment, 
+		a.phone = e.data.phone
+		a.formId = t.detail.formId,
+		console.log('最终数据',a)
+		e.order_submit(a, "s")
     },
     onReady: function () {},
     onShow: function (t) {
@@ -129,19 +156,25 @@ Page({
             is_loading_show = !0, getApp().page.onShow(this);
             var e = this,
                 a = getApp().core.getStorageSync(getApp().const.PICKER_ADDRESS);
+				console.log('传过来的address地址信息',a)
             a && e.setData({
                 address: a
-            }), getApp().core.removeStorageSync(getApp().const.PICKER_ADDRESS), e.getOrderData(e.data.options)
+            }), 
+			getApp().core.removeStorageSync(getApp().const.PICKER_ADDRESS), e.getOrderData(e.data.options)
         }
     },
     getOrderData: function (t) {
         var _ = this,
             e = {},
             a = "";
-        _.data.address && _.data.address.id && (a = _.data.address.id), e.address_id = a, e.longitude = longitude, e.latitude = latitude, getApp().core.showLoading({
+        _.data.address && _.data.address.id && (a = _.data.address.id), 
+		e.address_id = a, 
+		e.longitude = longitude,
+		e.latitude = latitude, getApp().core.showLoading({
             title: "正在加载",
             mask: !0
-        }), e.mch_list = t.mch_list, getApp().request({
+        }), e.mch_list = t.mch_list,
+		 getApp().request({
             url: getApp().api.order.new_submit_preview,
             method: "POST",
             data: e,
@@ -170,7 +203,8 @@ Page({
                         var c = {},
                             p = {};
                         if (s[r].show = !1, s[r].show_length = s[r].goods_list.length - 1, 0 != n.length)
-                            for (var d in n) s[r].mch_id == n[d].mch_id && (s[r].content = n[d].content, s[r].form = n[d].form, c = n[d].shop, p = n[d].picker_coupon, s[r].offline_name = n[d].offline_name, s[r].offline_mobile = n[d].offline_mobile);
+                            for (var d in n) 
+							s[r].mch_id == n[d].mch_id && (s[r].content = n[d].content, s[r].form = n[d].form, c = n[d].shop, p = n[d].picker_coupon, s[r].offline_name = n[d].offline_name, s[r].offline_mobile = n[d].offline_mobile);
                         for (var d in s[r].shop_list) {
                             if (c && c.id == s[r].shop_list[d].id) {
                                 s[r].shop = c;

pages/new-order-submit/new-order-submit.wxml

@@ -229,12 +229,23 @@
 							</view>
 						</block>
 
+						<block wx:if='{{is_virtual == 0 ? false:true}}'>
+							<view class='flex flex-row flex-y-center border-bottom' style='background: #fff;padding: 0 24rpx;height: 90rpx;margin-bottom:20rpx;'>
+								<view class='flex-grow-0'><text style='color: red;'>*</text>电话号码</view>
+								<view class='flex-grow-0' style='padding-left: 24rpx'>
+									<input bindinput='bindMobileInput' type="number" data-index='{{index}}' name='mobile' placeholder='请填写电话号码' style='width:100%;' value='{{item.phone}}'></input>
+								</view>
+							</view>
+						</block>				
+						
 						<block wx:if='{{ ( (item.form.is_form == 0 && item.mch_id == 0)  || item.mch_id > 0) }}'>
 							<view class='flex flex-row flex-y-center border-bottom' style='background: #fff;padding: 0 24rpx;height: 90rpx'>
 								<view class='flex-grow-0'>买家留言</view>
-								<view class='flex-grow-0' style='padding-left: 24rpx'><input bindinput='bindContentInput' data-index='{{index}}' name='content' placeholder='请填写备注' style='width:100%;' value='{{item.content}}'></input></view>
+								<view class='flex-grow-0' style='padding-left: 24rpx'>
+									<input bindinput='bindContentInput' data-index='{{index}}' name='content' placeholder='请填写备注' style='width:100%;' value='{{item.content}}'></input></view>
 							</view>
 						</block>
+						
 						<block wx:if='{{ ( ( (item.mch_id == 0 && item.form)  && item.form.is_form == 1)  && item.form.list.length > 0) }}'><template is='form' data='{{item:item,index:index,__wxapp_img:__wxapp_img}}'></template></block>
 					</view>
 				</block>

pages/order-detail/order-detail.wxml

@@ -157,13 +157,12 @@
 
 								<block>
 									<view class='block-row flex-row'>
-											<view class='flex-grow-1'>
-												<text class="font-w">二维码</text> 
-											</view>
-											<view class='flex-grow-0'>
-												<text bindtap='viewImg' class='copy-text-btn' data-qrUrl='{{virtual_data.virtual_code_qr}}'>查看</text>
-											</view>
-											
+										<view class='flex-grow-1'>
+											<text class="font-w">二维码</text> 
+										</view>
+										<view class='flex-grow-0'>
+											<text bindtap='viewImg' class='copy-text-btn' data-qrUrl='{{virtual_data.virtual_code_qr}}'>查看</text>
+										</view>
 									</view>	
 								</block>
 								

pages/test/index.json

@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "车享家限时优惠"
+  "navigationBarTitleText": "车享家限时特惠"
 }

pages/test/index.wxml

@@ -1,79 +1,29 @@
-<!-- <view class="content">
-      <image src="http://dm.dhcarlife.com/core/image/store_21320/279eb5c66200a6002e835db916f0b8c3769aee1f.jpg" 
-       data-src="http://dm.dhcarlife.com/core/image/store_21320/279eb5c66200a6002e835db916f0b8c3769aee1f.jpg"
+<view class="content">
+      <image src="http://dm.dhcarlife.com/core//image/store_21320/2111ef0c0e39d7815ceefeb265f2db2c288ae5a6.jpg" 
+       data-src="http://dm.dhcarlife.com/core//image/store_21320/2111ef0c0e39d7815ceefeb265f2db2c288ae5a6.jpg"
        data-from="content"
       bindtap="wxParseImgTap" mode='widthFix' style="width:100%;"></image>
-    <navigator url="/pages/goods/goods?id=85">
-      <image src="http://dm.dhcarlife.com/core/image/store_21320/a5d97c2878012cbdbf46938a13e8a2c739c4f831.jpg" mode='widthFix' style="width:100%;"></image>
+    <navigator url="/pages/goods/goods?id=101">
+      <image src="http://dm.dhcarlife.com/core//image/store_21320/e9977bceeb0c980e5ae741ef1a61373067656ee0.jpg" mode='widthFix' style="width:100%;"></image>
+    </navigator>
+    <navigator url="/pages/goods/goods?id=99">
+      <image src="http://dm.dhcarlife.com/core//image/store_21320/4668368245b62783b508e957342945c393d5162c.jpg" mode='widthFix' style="width:100%;"></image>
+    </navigator>
+    <navigator  url="/pages/goods/goods?id=88">
+      <image src="http://dm.dhcarlife.com/core//image/store_21320/d3903ed630b6d1ed5b8a7ef9d557ad755377c0f0.jpg" mode='widthFix' style="width:100%;"></image>
     </navigator>
-    <navigator url="/pages/goods/goods?id=84">
-      <image src="http://dm.dhcarlife.com/core/image/store_21320/1d1eaea7d09f19f4083e0b512e29f3d7cfcfcc30.jpg" mode='widthFix' style="width:100%;"></image>
+    <navigator  url="/pages/goods/goods?id=89">
+      <image src="http://dm.dhcarlife.com/core//image/store_21320/fbb8799bc5d932740e9c6e3e45e50a93593d4719.jpg" mode='widthFix' style="width:100%;"></image>
     </navigator>
     <navigator  url="/pages/goods/goods?id=86">
-      <image src="http://dm.dhcarlife.com/core/image/store_21320/d916bd40602ec96f8df9cf347e6bc5e8622b79cf.jpg" mode='widthFix' style="width:100%;"></image>
+      <image src="http://dm.dhcarlife.com/core//image/store_21320/8e259dacf872ac19a3e7d6a7a23645e093bd1e0a.jpg" mode='widthFix' style="width:100%;"></image>
     </navigator>
-    <image src="https://dm.dhcarlife.com/core/image/store_21320/838f57c6c943dfabf5cdca836638df00a5e3f6e0.jpg" 
-      data-src="https://dm.dhcarlife.com/core/image/store_21320/838f57c6c943dfabf5cdca836638df00a5e3f6e0.jpg" 
+    <image src="http://dm.dhcarlife.com/core//image/store_21320/af6a56fde7fe8213aa201f225e95bec7f984745e.jpg" 
+      data-src="http://dm.dhcarlife.com/core//image/store_21320/af6a56fde7fe8213aa201f225e95bec7f984745e.jpg" 
+      data-from="content"
+    bindtap="wxParseImgTap" mode='widthFix' style="width:100%;"></image>
+    <image src="http://dm.dhcarlife.com/core//image/store_21320/dbd90631c27dbe65c9e51f0a00f3bb7865fe8654.jpg" 
+      data-src="http://dm.dhcarlife.com/core//image/store_21320/dbd90631c27dbe65c9e51f0a00f3bb7865fe8654.jpg" 
       data-from="content"
     bindtap="wxParseImgTap" mode='widthFix' style="width:100%;"></image>
-</view> -->
-<!-- <view class="content"> -->
-<!-- 	<image src="http://dm.dhcarlife.com/core//image/store_21320/64a18a59d011090ef7db7d4aeaf871241758908c.gif"
-	 data-src="http://dm.dhcarlife.com/core//image/store_21320/64a18a59d011090ef7db7d4aeaf871241758908c.gif"
-	 data-from="content"
-	bindtap="wxParseImgTap" mode='widthFix' style="width:100%;"></image>
-	<image src="http://dm.dhcarlife.com/core//image/store_21320/0bec03b97751059b4372b1fd392fab6b65e7f210.gif"
-	 data-src="http://dm.dhcarlife.com/core//image/store_21320/0bec03b97751059b4372b1fd392fab6b65e7f210.gif"
-	 data-from="content"
-	bindtap="wxParseImgTap" mode='widthFix' style="width:100%;"></image>
-	<navigator url="/pages/goods/goods?id=101">
-	  <image src="http://dm.dhcarlife.com/core//image/store_21320/44a35413da03c36fe6ca3c1a611ee54ba55599b1.gif" mode='widthFix' style="width:100%;"></image>
-	</navigator>
-	<navigator url="/pages/goods/goods?id=99">
-	  <image src="http://dm.dhcarlife.com/core//image/store_21320/53cb1bdc847038701b735fad2851085a1e0375fb.gif" mode='widthFix' style="width:100%;"></image>
-	</navigator>
-	<navigator url="/pages/goods/goods?id=88">
-	  <image src="http://dm.dhcarlife.com/core//image/store_21320/0805307984e7bfeef3058b4ac721a7f05a85365e.gif" mode='widthFix' style="width:100%;"></image>
-	</navigator>
-	<navigator url="/pages/goods/goods?id=89">
-	  <image src="http://dm.dhcarlife.com/core//image/store_21320/1e422efa0cfac30bb44dd08e1790d652821ebdef.gif" mode='widthFix' style="width:100%;"></image>
-	</navigator>
-	<navigator url="/pages/goods/goods?id=86">
-	  <image src="http://dm.dhcarlife.com/core//image/store_21320/e66185f5b5ef49a6de1a0f115e9812ef6ab5fd6c.gif" mode='widthFix' style="width:100%;"></image>
-	</navigator>
-	<image src="http://dm.dhcarlife.com/core//image/store_21320/0d9378991d7180e01003177407c6f3c0c07910fe.jpg"
-	  data-src="http://dm.dhcarlife.com/core//image/store_21320/0d9378991d7180e01003177407c6f3c0c07910fe.jpg" 
-	  data-from="content"
-	  bindtap="wxParseImgTap" mode='widthFix' style="width:100%;"></image> -->
-<!-- </view> -->
-<view class="content">
-	<image src="http://dm.dhcarlife.com/core//image/store_21320/b6bd28662353d5f6b730c069c4587f9c88a2f3df.png"
-		 data-src="http://dm.dhcarlife.com/core//image/store_21320/b6bd28662353d5f6b730c069c4587f9c88a2f3df.png"
-		 data-from="content"
-		bindtap="wxParseImgTap" mode='widthFix' style="width:100%;"></image>
-	<navigator url="/pages/goods/goods?id=104">
-	  <image src="http://dm.dhcarlife.com/core//image/store_21320/49d624a9c938a37dd52c464a238f7a5040cda7b1.png" mode='widthFix' style="width:100%;"></image>
-	</navigator>
-	<navigator url="/pages/goods/goods?id=99">
-	  <image src="http://dm.dhcarlife.com/core//image/store_21320/077ce83001e3061d2ad3dfd425f987e591ee66f2.png" mode='widthFix' style="width:100%;"></image>
-	</navigator>
-	<navigator url="/pages/goods/goods?id=100">
-	  <image src="http://dm.dhcarlife.com/core//image/store_21320/d38dbfa2260a81bd91facd5e0c7fe10ab225a4ce.png" mode='widthFix' style="width:100%;"></image>
-	</navigator>
-	<navigator url="/pages/goods/goods?id=105">
-	  <image src="http://dm.dhcarlife.com/core//image/store_21320/04cec9a5c4dc876b7e333df6ab66ccfd0e68804f.png" mode='widthFix' style="width:100%;"></image>
-	</navigator>
-	<navigator url="/pages/goods/goods?id=91">
-	  <image src="http://dm.dhcarlife.com/core//image/store_21320/ada92969267c5a859e721dd415129846ce5ccbe8.png" mode='widthFix' style="width:100%;"></image>
-	</navigator>
-	<navigator url="/pages/goods/goods?id=106">
-	  <image src="http://dm.dhcarlife.com/core//image/store_21320/fd4fd9cd0ee276f6e840ec5479237d8c6bf510d4.png" mode='widthFix' style="width:100%;"></image>
-	</navigator>
-	<navigator url="/pages/goods/goods?id=107">
-	  <image src="http://dm.dhcarlife.com/core//image/store_21320/1790d2eb246eb1df9a5d06774edc556654b4708f.png" mode='widthFix' style="width:100%;"></image>
-	</navigator>
-	<image src="http://dm.dhcarlife.com/core//image/store_21320/b25372b3f4ce78575207cd1d6cba493512c429d3.png"
-	  data-src="http://dm.dhcarlife.com/core//image/store_21320/b25372b3f4ce78575207cd1d6cba493512c429d3.png" 
-	  data-from="content"
-	  bindtap="wxParseImgTap" mode='widthFix' style="width:100%;"></image>
 </view>

pages/topic/topic.wxss

@@ -11,3 +11,4 @@
 .goods-link .goods-info{ padding: 32rpx 24rpx 24rpx 232rpx !important; height: 100%; }
 .goods-link .goods-name{ -webkit-line-clamp: 2; display: -webkit-box; -webkit-box-orient: vertical; overflow: hidden; margin-bottom: 16rpx; }
 .wxParse-p wx-image{ margin-left: 0; margin-right: 0; }
+image{ width: 100%;display: block;overflow: hidden; }

project.config.json

@@ -31,8 +31,11 @@
     "useIsolateContext": true,
     "useCompilerModule": true,
     "userConfirmedUseCompilerModuleSwitch": false,
+    "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
-    "packNpmRelationList": []
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "bundle": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.10.1",
@@ -50,27 +53,21 @@
   "simulatorPluginLibVersion": {},
   "condition": {
     "search": {
-      "current": -1,
       "list": []
     },
     "conversation": {
-      "current": -1,
       "list": []
     },
     "plugin": {
-      "current": -1,
       "list": []
     },
     "game": {
-      "current": -1,
       "list": []
     },
     "gamePlugin": {
-      "current": -1,
       "list": []
     },
     "miniprogram": {
-      "current": 5,
       "list": [
         {
           "id": -1,
@@ -108,9 +105,9 @@
           "scene": null
         },
         {
-          "id": -1,
+          "id": 5,
           "name": "pages/test/index",
-          "pathName": "pages/test/index",
+          "pathName": "pages/test/cxj",
           "query": "",
           "scene": null
         },
@@ -120,6 +117,20 @@
           "pathName": "pages/topic/topic",
           "query": "",
           "scene": null
+        },
+        {
+          "id": 7,
+          "name": "pages/coupon-list/coupon-list",
+          "pathName": "pages/coupon-list/coupon-list",
+          "query": "coupon_id=16",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/topic-list/topic-list",
+          "pathName": "pages/topic-list/topic-list",
+          "query": "",
+          "scene": null
         }
       ]
     }

wxParse/wxParse.wxml

@@ -1,8 +1,10 @@
 <template name='wxParseVideo'>
 	<view class='{{item.classStr}} wxParse-{{item.tag}}' style='{{item.styleStr}}'><video class='{{item.classStr}} wxParse-{{item.tag}}-video' src='{{item.attr.src}}'></video></view>
-</template><template name='wxParseImg'>
+</template>
+<template name='wxParseImg'>
 	<image bindload='wxParseImgLoad' bindtap='wxParseImgTap' class='{{item.classStr}} wxParse-{{item.tag}}' data-from='{{item.from}}' data-idx='{{item.imgIndex}}' data-src='{{item.attr.src}}' mode='{{(item.attr.mode?item.attr.mode:"widthFix")}}' src='{{item.attr.src}}' style='width:{{item.width}}px;'></image>
-</template><template name='WxEmojiView'>
+</template>
+<template name='WxEmojiView'>
 	<view class='WxEmojiView wxParse-inline' style='{{item.styleStr}}'>
 		<block wx:for='{{item.textArray}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'>
 			<block wx:if='{{item.node == "text"}}'>{{item.text}}</block>
@@ -11,9 +13,11 @@
 			</block>
 		</block>
 	</view>
-</template><template name='wxParse'>
+</template>
+<template name='wxParse'>
 	<block wx:for='{{wxParseData}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse0' data='{{item:item}}'></template></block>
-</template><template name='wxParse0'>
+</template>
+<template name='wxParse0'>
 	<block wx:if='{{item.node == "element"}}'>
 		<block wx:if='{{item.tag == "button"}}'><button size='mini' type='default'>
 				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse1' data='{{item:item}}'></template></block>
@@ -33,7 +37,7 @@
 		<block wx:elif='{{item.tag == "video"}}'><template is='wxParseVideo' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "img"}}'><template is='wxParseImg' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "a"}}'>
-			<view capture-catch:touchstart='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
+			<view capture-catch:tap='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
 				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse1' data='{{item:item}}'></template></block>
 			</view>
 		</block>
@@ -74,8 +78,10 @@
 		<block wx:elif='{{item.tag == "video"}}'><template is='wxParseVideo' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "img"}}'><template is='wxParseImg' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "a"}}'>
-			<view capture-catch:touchstart='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-goods='{{item.attr.goods}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
-				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse2' data='{{item:item}}'></template></block>
+			<view capture-catch:tap='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-goods='{{item.attr.goods}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
+				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'>
+					<template is='wxParse2' data='{{item:item}}'></template>
+				</block>
 			</view>
 		</block>
 		<block wx:elif='{{item.tagType == "block"}}'>
@@ -90,7 +96,8 @@
 		</block>
 	</block>
 	<block wx:elif='{{item.node == "text"}}'><template is='WxEmojiView' data='{{item:item}}'></template></block>
-</template><template name='wxParse2'>
+</template>
+<template name='wxParse2'>
 	<block wx:if='{{item.node == "element"}}'>
 		<block wx:if='{{item.tag == "button"}}'><button size='mini' type='default'>
 				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse3' data='{{item:item}}'></template></block>
@@ -110,7 +117,7 @@
 		<block wx:elif='{{item.tag == "video"}}'><template is='wxParseVideo' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "img"}}'><template is='wxParseImg' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "a"}}'>
-			<view capture-catch:touchstart='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-goods='{{item.attr.goods}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
+			<view capture-catch:tap='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-goods='{{item.attr.goods}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
 				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse3' data='{{item:item}}'></template></block>
 			</view>
 		</block>
@@ -146,7 +153,7 @@
 		<block wx:elif='{{item.tag == "video"}}'><template is='wxParseVideo' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "img"}}'><template is='wxParseImg' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "a"}}'>
-			<view capture-catch:touchstart='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
+			<view capture-catch:tap='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
 				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse4' data='{{item:item}}'></template></block>
 			</view>
 		</block>
@@ -182,7 +189,7 @@
 		<block wx:elif='{{item.tag == "video"}}'><template is='wxParseVideo' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "img"}}'><template is='wxParseImg' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "a"}}'>
-			<view capture-catch:touchstart='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
+			<view capture-catch:tap='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
 				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse5' data='{{item:item}}'></template></block>
 			</view>
 		</block>
@@ -218,7 +225,7 @@
 		<block wx:elif='{{item.tag == "video"}}'><template is='wxParseVideo' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "img"}}'><template is='wxParseImg' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "a"}}'>
-			<view capture-catch:touchstart='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
+			<view capture-catch:tap='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
 				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse6' data='{{item:item}}'></template></block>
 			</view>
 		</block>
@@ -254,7 +261,7 @@
 		<block wx:elif='{{item.tag == "video"}}'><template is='wxParseVideo' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "img"}}'><template is='wxParseImg' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "a"}}'>
-			<view capture-catch:touchstart='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
+			<view capture-catch:tap='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
 				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse7' data='{{item:item}}'></template></block>
 			</view>
 		</block>
@@ -290,7 +297,7 @@
 		<block wx:elif='{{item.tag == "video"}}'><template is='wxParseVideo' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "img"}}'><template is='wxParseImg' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "a"}}'>
-			<view capture-catch:touchstart='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
+			<view capture-catch:tap='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
 				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse8' data='{{item:item}}'></template></block>
 			</view>
 		</block>
@@ -326,7 +333,7 @@
 		<block wx:elif='{{item.tag == "video"}}'><template is='wxParseVideo' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "img"}}'><template is='wxParseImg' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "a"}}'>
-			<view capture-catch:touchstart='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
+			<view capture-catch:tap='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
 				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse9' data='{{item:item}}'></template></block>
 			</view>
 		</block>
@@ -362,7 +369,7 @@
 		<block wx:elif='{{item.tag == "video"}}'><template is='wxParseVideo' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "img"}}'><template is='wxParseImg' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "a"}}'>
-			<view capture-catch:touchstart='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
+			<view capture-catch:tap='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
 				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse10' data='{{item:item}}'></template></block>
 			</view>
 		</block>
@@ -398,7 +405,7 @@
 		<block wx:elif='{{item.tag == "video"}}'><template is='wxParseVideo' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "img"}}'><template is='wxParseImg' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "a"}}'>
-			<view capture-catch:touchstart='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
+			<view capture-catch:tap='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
 				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse11' data='{{item:item}}'></template></block>
 			</view>
 		</block>
@@ -434,7 +441,7 @@
 		<block wx:elif='{{item.tag == "video"}}'><template is='wxParseVideo' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "img"}}'><template is='wxParseImg' data='{{item:item}}'></template></block>
 		<block wx:elif='{{item.tag == "a"}}'>
-			<view capture-catch:touchstart='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
+			<view capture-catch:tap='wxParseTagATap' class='wxParse-inline {{item.classStr}} wxParse-{{item.tag}}' data-src='{{item.attr.href}}' style='{{item.styleStr}}'>
 				<block wx:for='{{item.nodes}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}'><template is='wxParse12' data='{{item:item}}'></template></block>
 			</view>
 		</block>