From 852126376000c1194b7d84dc180137d7d45eb07b Mon Sep 17 00:00:00 2001
From: ZF sun <34314687@qq.com>
Date: Mon, 22 Dec 2025 09:02:45 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E7=BC=A9=E5=87=8F=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diy-components/diy-category-item.wxml     |   2 +-
 components/hover-nav/hover-nav.wxml           |  28 +-
 .../ns-goods-action-icon.wxml                 |  31 +-
 .../wx-privacy-popup/privacy-popup.wxml       |   3 +-
 pages/goods/detail.wxml                       | 651 +-----------------
 pages/order/detail.wxml                       |   2 +-
 pages_tool/order/logistics.wxml               |   2 +-
 project.config.json                           |  63 +-
 .../mp-html/components/mp-html/node/node.wxml |  30 +-
 9 files changed, 70 insertions(+), 742 deletions(-)

diff --git a/components/diy-components/diy-category-item.wxml b/components/diy-components/diy-category-item.wxml
index ab15020..21f5ba3 100644
--- a/components/diy-components/diy-category-item.wxml
+++ b/components/diy-components/diy-category-item.wxml
@@ -1 +1 @@
-<view class="{{['item-wrap',type]}}"><block wx:if="{{$root.g0}}"><block><block wx:if="{{category.image_adv}}"><view data-event-opts="{{[['tap',[['diyRedirectTo',['$0'],['category.link_url']]]]]}}" class="category-adv" bindtap="__e"><image src="{{$root.g1}}" mode="widthFix"></image></view></block><block wx:if="{{value.level==2}}"><block><view class="category-title">{{category.category_name}}</view><view class="category-list"><block wx:for="{{$root.l0}}" wx:for-item="one" wx:for-index="oneIndex" wx:key="oneIndex"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" data-event-params="{{({one:one.$orig})}}" class="category-item" bindtap="__e"><view class="img-box"><image src="{{one.g2}}" mode="widthFix"></image></view><view class="name">{{lang=='en-us'?one.$orig.en_category_name:one.$orig.category_name}}</view></view></block></view></block></block><block wx:if="{{value.level==3}}"><block><block wx:for="{{$root.l2}}" wx:for-item="one" wx:for-index="oneIndex" wx:key="oneIndex"><block><view class="category-title">{{one.$orig.category_name}}</view><view class="category-list"><block wx:for="{{one.l1}}" wx:for-item="two" wx:for-index="twoIndex" wx:key="twoIndex"><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" data-event-params="{{({two:two.$orig})}}" class="category-item" bindtap="__e"><view class="img-box"><image src="{{two.g3}}" mode="widthFix" lazy-load="{{true}}"></image></view><view class="name">{{two.$orig.category_name}}</view></view></block></view></block></block></block></block></block></block><block wx:if="{{type=='goods'}}"><block><block wx:if="{{loadType=='part'}}"><view class="categoty-goods-wrap" style="{{('padding-top:'+(value.search?0:'20rpx'))}}"><block wx:if="{{category.child_list&&value.goodsLevel==2}}"><block><view class="screen-category-wrap"><scroll-view class="{{['screen-category',(value.template==4)?'screen-category-4':'']}}" scroll-x="true" scroll-with-animation="{{true}}" scroll-into-view="{{scrollIntoView}}"><view class="{{['item',(categoryId==-1)?'selected':'']}}" id="category-2--1" data-event-opts="{{[['tap',[['selectCategoey',[-1]]]]]}}" bindtap="__e">全部</view><block wx:for="{{category.child_list}}" wx:for-item="one" wx:for-index="oneIndex" wx:key="oneIndex"><view class="{{['item',(categoryId==oneIndex)?'selected':'']}}" id="{{'category-2-'+oneIndex}}" data-event-opts="{{[['tap',[['selectCategoey',[oneIndex]]]]]}}" bindtap="__e">{{''+one.category_name+''}}</view></block></scroll-view><view data-event-opts="{{[['tap',[['e2',['$event']]]]]}}" class="iconfont icon-unfold" bindtap="__e"></view></view><uni-popup class="vue-ref" vue-id="0a57d9e2-1" type="top" data-ref="screenCategoryPopup" bind:__l="__l" vue-slots="{{['default']}}"><view data-event-opts="{{[['tap',[['e3',['$event']]]]]}}" class="screen-category-popup" bindtap="__e"><scroll-view class="{{['screen-category',(value.template==4)?'screen-category-4':'']}}" scroll-y="true"><view class="title">全部</view><block wx:for="{{category.child_list}}" wx:for-item="one" wx:for-index="oneIndex" wx:key="oneIndex"><view data-event-opts="{{[['tap',[['selectCategoey',[oneIndex]]]]]}}" class="{{['item',(categoryId==oneIndex)?'selected':'']}}" bindtap="__e">{{''+one.category_name+''}}</view></block></scroll-view></view></uni-popup></block></block><scroll-view class="scroll-goods-view" scroll-y="true" lower-threshold="300" scroll-top="{{scrollTop}}" data-event-opts="{{[['scrolltolower',[['scrolltolower',['$event']]]],['touchstart',[['touchstart',['$event']]]],['touchend',[['touchend',['$event']]]],['scroll',[['listenScroll',['$event']]]]]}}" bindscrolltolower="__e" bindtouchstart="__e" bindtouchend="__e" bindscroll="__e"><view class="category-title" style="font-size:28rpx;padding-bottom:0;">{{lang=='en-us'?category.en_category_name:category.category_name}}</view><view class="{{[isList?'goods-list  double-column show':'goods-list-single']}}" data-template="{{value.template}}"><block wx:if="{{$root.g4}}"><block><block wx:for="{{$root.l3}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="goods-item"><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="goods-img" bindtap="__e"><image src="{{item.m0}}" mode="widthFix" data-event-opts="{{[['error',[['imgError',[index]]]]]}}" binderror="__e"></image><block wx:if="{{item.$orig.label_name}}"><view class="color-base-bg goods-tag">{{item.$orig.label_name}}</view></block></view><view class="info-wrap"><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="name-wrap" bindtap="__e"><view class="goods-name">{{lang=='en-us'?item.$orig.en_goods_name:item.$orig.goods_name}}</view></view><block wx:if="{{isList}}"><view class="price-wrap"><view class="discount-price"><block wx:if="{{item.$orig.isinformation==0}}"><block><text class="unit price-style small">￥</text><text class="price price-style large">{{item.g5[0]}}</text><text class="unit price-style small">{{"."+item.g6[1]}}</text></block></block><block wx:else><block><text class="unit price-style small">{{lang=='en-us'?'Make':'咨询'}}</text></block></block></view><block wx:if="{{item.m1}}"><view class="member-price-tag"><image src="{{item.g7}}" mode="widthFix"></image></view></block><block wx:else><block wx:if="{{item.$orig.promotion_type==1}}"><view class="member-price-tag"><image src="{{item.g8}}" mode="widthFix"></image></view></block></block></view></block><block wx:if="{{!isList}}"><view class="footer-wrap"><view class="pro-info"><block wx:if="{{item.$orig.isinformation==0}}"><view class="font-size-activity-tag color-tip price-font"><text class="unit price-style small">￥</text><text class="price price-style large">{{item.g9[0]}}</text><text class="unit price-style small">{{"."+item.g10[1]}}</text></view></block></view><block wx:if="{{!isList}}"><view class="right-wrap"><block wx:if="{{item.$orig.isinformation==0}}"><block><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="color-base-bg select-sku" bindtap="__e">{{lang=='en-us'?'Buy':'马上抢'}}</view></block></block><block wx:if="{{item.$orig.isinformation==1}}"><block><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="color-base-bg select-sku" bindtap="__e">{{lang=='en-us'?'Make':'立即咨询'}}</view></block></block></view></block></view></block></view></view></block></block></block><block wx:else><view class="category-empty"><image src="{{$root.g11}}" mode="widthFix"></image></view></block></view><loading-cover class="vue-ref" vue-id="0a57d9e2-2" init-show="{{loading}}" data-ref="loadingCover" bind:__l="__l"></loading-cover></scroll-view></view></block><block wx:if="{{$root.g12}}"><block><view class="goods-list" data-template="{{value.template}}"><block wx:for="{{$root.l4}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="goods-item"><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="goods-img" bindtap="__e"><image src="{{item.m2}}" mode="widthFix" lazy-load="{{true}}" data-event-opts="{{[['error',[['imgError',[index]]]]]}}" binderror="__e"></image><block wx:if="{{item.$orig.label_name}}"><view class="color-base-bg goods-tag">{{item.$orig.label_name}}</view></block></view><view class="info-wrap"><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="name-wrap" bindtap="__e"><view class="goods-name">{{item.$orig.goods_name}}</view></view><view class="price-wrap"><view class="discount-price"><block wx:if="{{item.$orig.isinformation==0}}"><block><text class="unit price-style small">￥</text><text class="price price-style large">{{item.g13[0]}}</text><text class="unit price-style small">{{"."+item.g14[1]}}</text></block></block><block wx:else><block><text class="unit price-style small">{{lang=='en-us'?'Make':'咨询'}}</text></block></block></view><block wx:if="{{item.m3}}"><view class="member-price-tag"><image src="{{item.g15}}" mode="widthFix"></image></view></block><block wx:else><block wx:if="{{item.$orig.promotion_type==1}}"><view class="member-price-tag"><image src="{{item.g16}}" mode="widthFix"></image></view></block></block></view><view class="footer-wrap"><view class="pro-info"><block wx:if="{{item.m4}}"><view class="delete-price font-size-activity-tag color-tip price-font"><text class="unit">￥</text><text>{{item.m5}}</text></view></block></view><block wx:if="{{value.template==2}}"><view class="right-wrap"><block wx:if="{{item.$orig.is_virtual}}"><block><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="color-base-bg select-sku" bindtap="__e">立即购买</view></block></block><block wx:else><block><block wx:if="{{item.$orig.goods_spec_format}}"><view data-event-opts="{{[['tap',[['selectSku',['$0'],[[['goodsList','',index]]]]]]]}}" class="color-base-bg select-sku" bindtap="__e"><text>选规格</text><block wx:if="{{item.$orig.num}}"><text class="num-tag">{{item.$orig.num}}</text></block></view></block><block wx:else><block><block wx:if="{{cartList['goods_'+item.$orig.goods_id]&&cartList['goods_'+item.$orig.goods_id]['sku_'+item.$orig.sku_id]}}"><block><view data-event-opts="{{[['tap',[['reduce',['$0'],[[['goodsList','',index]]]]]]]}}" class="num-action reduce" bindtap="__e"><text class="iconfont icon-jian"></text></view><view class="num">{{cartList['goods_'+item.$orig.goods_id]['sku_'+item.$orig.sku_id].num}}</view><view class="num-action" id="{{'cart-num-'+index}}" data-event-opts="{{[['tap',[['increase',['$event','$0'],[[['goodsList','',index]]]]]]]}}" bindtap="__e"><text class="iconfont icon-jia"></text><view class="click-event"></view></view></block></block><block wx:else><view class="num-action" id="{{'cart-num-'+index}}" data-event-opts="{{[['tap',[['increase',['$event','$0',0],[[['goodsList','',index]]]]]]]}}" bindtap="__e"><text class="iconfont icon-jia"></text><view class="click-event"></view></view></block></block></block></block></block></view></block><block wx:if="{{value.template==3}}"><view class="right-wrap"><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="color-base-bg select-sku" bindtap="__e">立即购买</view></view></block></view></view></view></block></view></block></block></block></block></view>
\ No newline at end of file
+<view class="{{['item-wrap',type]}}"><block wx:if="{{$root.g0}}"><block><block wx:if="{{category.image_adv}}"><view data-event-opts="{{[['tap',[['diyRedirectTo',['$0'],['category.link_url']]]]]}}" class="category-adv" bindtap="__e"><image src="{{$root.g1}}" mode="widthFix"></image></view></block><block wx:if="{{value.level==2}}"><block><view class="category-title">{{category.category_name}}</view><view class="category-list"><block wx:for="{{$root.l0}}" wx:for-item="one" wx:for-index="oneIndex" wx:key="oneIndex"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" data-event-params="{{({one:one.$orig})}}" class="category-item" bindtap="__e"><view class="img-box"><image src="{{one.g2}}" mode="widthFix"></image></view><view class="name">{{lang=='en-us'?one.$orig.en_category_name:one.$orig.category_name}}</view></view></block></view></block></block><block wx:if="{{value.level==3}}"><block><block wx:for="{{$root.l2}}" wx:for-item="one" wx:for-index="oneIndex" wx:key="oneIndex"><block><view class="category-title">{{one.$orig.category_name}}</view><view class="category-list"><block wx:for="{{one.l1}}" wx:for-item="two" wx:for-index="twoIndex" wx:key="twoIndex"><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" data-event-params="{{({two:two.$orig})}}" class="category-item" bindtap="__e"><view class="img-box"><image src="{{two.g3}}" mode="widthFix" lazy-load="{{true}}"></image></view><view class="name">{{two.$orig.category_name}}</view></view></block></view></block></block></block></block></block></block><block wx:if="{{type=='goods'}}"><block><block wx:if="{{loadType=='part'}}"><view class="categoty-goods-wrap" style="{{('padding-top:'+(value.search?0:'20rpx'))}}"><block wx:if="{{category.child_list&&value.goodsLevel==2}}"><block><view class="screen-category-wrap"><scroll-view class="{{['screen-category',(value.template==4)?'screen-category-4':'']}}" scroll-x="true" scroll-with-animation="{{true}}" scroll-into-view="{{scrollIntoView}}"><view class="{{['item',(categoryId==-1)?'selected':'']}}" id="category-2--1" data-event-opts="{{[['tap',[['selectCategoey',[-1]]]]]}}" bindtap="__e">全部</view><block wx:for="{{category.child_list}}" wx:for-item="one" wx:for-index="oneIndex" wx:key="oneIndex"><view class="{{['item',(categoryId==oneIndex)?'selected':'']}}" id="{{'category-2-'+oneIndex}}" data-event-opts="{{[['tap',[['selectCategoey',[oneIndex]]]]]}}" bindtap="__e">{{''+one.category_name+''}}</view></block></scroll-view><view data-event-opts="{{[['tap',[['e2',['$event']]]]]}}" class="iconfont icon-unfold" bindtap="__e"></view></view><uni-popup class="vue-ref" vue-id="0a57d9e2-1" type="top" data-ref="screenCategoryPopup" bind:__l="__l" vue-slots="{{['default']}}"><view data-event-opts="{{[['tap',[['e3',['$event']]]]]}}" class="screen-category-popup" bindtap="__e"><scroll-view class="{{['screen-category',(value.template==4)?'screen-category-4':'']}}" scroll-y="true"><view class="title">全部</view><block wx:for="{{category.child_list}}" wx:for-item="one" wx:for-index="oneIndex" wx:key="oneIndex"><view data-event-opts="{{[['tap',[['selectCategoey',[oneIndex]]]]]}}" class="{{['item',(categoryId==oneIndex)?'selected':'']}}" bindtap="__e">{{''+one.category_name+''}}</view></block></scroll-view></view></uni-popup></block></block><scroll-view class="scroll-goods-view" scroll-y="true" lower-threshold="300" scroll-top="{{scrollTop}}" data-event-opts="{{[['scrolltolower',[['scrolltolower',['$event']]]],['touchstart',[['touchstart',['$event']]]],['touchend',[['touchend',['$event']]]],['scroll',[['listenScroll',['$event']]]]]}}" bindscrolltolower="__e" bindtouchstart="__e" bindtouchend="__e" bindscroll="__e"><view class="category-title" style="font-size:28rpx;padding-bottom:0;">{{lang=='en-us'?category.en_category_name:category.category_name}}</view><view class="{{[isList?'goods-list double-column show':'goods-list-single']}}" data-template="{{value.template}}"><block wx:if="{{$root.g4}}"><block><block wx:for="{{$root.l3}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="goods-item"><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="goods-img" bindtap="__e"><image src="{{item.m0}}" mode="widthFix" data-event-opts="{{[['error',[['imgError',[index]]]]]}}" binderror="__e"></image><block wx:if="{{item.$orig.label_name}}"><view class="color-base-bg goods-tag">{{item.$orig.label_name}}</view></block></view><view class="info-wrap"><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="name-wrap" bindtap="__e"><view class="goods-name">{{lang=='en-us'?item.$orig.en_goods_name:item.$orig.goods_name}}</view></view><block wx:if="{{isList}}"><view class="price-wrap"><view class="discount-price"><block wx:if="{{item.$orig.isinformation==0}}"><block><text class="unit price-style small">￥</text><text class="price price-style large">{{item.g5[0]}}</text><text class="unit price-style small">{{"."+item.g6[1]}}</text></block></block><block wx:else><block><text class="unit price-style small">{{lang=='en-us'?'Make':'咨询'}}</text></block></block></view><block wx:if="{{item.m1}}"><view class="member-price-tag"><image src="{{item.g7}}" mode="widthFix"></image></view></block><block wx:else><block wx:if="{{item.$orig.promotion_type==1}}"><view class="member-price-tag"><image src="{{item.g8}}" mode="widthFix"></image></view></block></block></view></block><block wx:if="{{!isList}}"><view class="footer-wrap"><view class="pro-info"><block wx:if="{{item.$orig.isinformation==0}}"><view class="font-size-activity-tag color-tip price-font"><text class="unit price-style small">￥</text><text class="price price-style large">{{item.g9[0]}}</text><text class="unit price-style small">{{"."+item.g10[1]}}</text></view></block></view><block wx:if="{{!isList}}"><view class="right-wrap"><block wx:if="{{item.$orig.isinformation==0}}"><block><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="color-base-bg select-sku" bindtap="__e">{{lang=='en-us'?'Buy':'马上抢'}}</view></block></block><block wx:if="{{item.$orig.isinformation==1}}"><block><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="color-base-bg select-sku" bindtap="__e">{{lang=='en-us'?'Make':'立即咨询'}}</view></block></block></view></block></view></block></view></view></block></block></block><block wx:else><view class="category-empty"><image src="{{$root.g11}}" mode="widthFix"></image></view></block></view><loading-cover class="vue-ref" vue-id="0a57d9e2-2" init-show="{{loading}}" data-ref="loadingCover" bind:__l="__l"></loading-cover></scroll-view></view></block><block wx:if="{{$root.g12}}"><block><view class="goods-list" data-template="{{value.template}}"><block wx:for="{{$root.l4}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="goods-item"><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="goods-img" bindtap="__e"><image src="{{item.m2}}" mode="widthFix" lazy-load="{{true}}" data-event-opts="{{[['error',[['imgError',[index]]]]]}}" binderror="__e"></image><block wx:if="{{item.$orig.label_name}}"><view class="color-base-bg goods-tag">{{item.$orig.label_name}}</view></block></view><view class="info-wrap"><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="name-wrap" bindtap="__e"><view class="goods-name">{{item.$orig.goods_name}}</view></view><view class="price-wrap"><view class="discount-price"><block wx:if="{{item.$orig.isinformation==0}}"><block><text class="unit price-style small">￥</text><text class="price price-style large">{{item.g13[0]}}</text><text class="unit price-style small">{{"."+item.g14[1]}}</text></block></block><block wx:else><block><text class="unit price-style small">{{lang=='en-us'?'Make':'咨询'}}</text></block></block></view><block wx:if="{{item.m3}}"><view class="member-price-tag"><image src="{{item.g15}}" mode="widthFix"></image></view></block><block wx:else><block wx:if="{{item.$orig.promotion_type==1}}"><view class="member-price-tag"><image src="{{item.g16}}" mode="widthFix"></image></view></block></block></view><view class="footer-wrap"><view class="pro-info"><block wx:if="{{item.m4}}"><view class="delete-price font-size-activity-tag color-tip price-font"><text class="unit">￥</text><text>{{item.m5}}</text></view></block></view><block wx:if="{{value.template==2}}"><view class="right-wrap"><block wx:if="{{item.$orig.is_virtual}}"><block><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="color-base-bg select-sku" bindtap="__e">立即购买</view></block></block><block wx:else><block><block wx:if="{{item.$orig.goods_spec_format}}"><view data-event-opts="{{[['tap',[['selectSku',['$0'],[[['goodsList','',index]]]]]]]}}" class="color-base-bg select-sku" bindtap="__e"><text>选规格</text><block wx:if="{{item.$orig.num}}"><text class="num-tag">{{item.$orig.num}}</text></block></view></block><block wx:else><block><block wx:if="{{cartList['goods_'+item.$orig.goods_id]&&cartList['goods_'+item.$orig.goods_id]['sku_'+item.$orig.sku_id]}}"><block><view data-event-opts="{{[['tap',[['reduce',['$0'],[[['goodsList','',index]]]]]]]}}" class="num-action reduce" bindtap="__e"><text class="iconfont icon-jian"></text></view><view class="num">{{cartList['goods_'+item.$orig.goods_id]['sku_'+item.$orig.sku_id].num}}</view><view class="num-action" id="{{'cart-num-'+index}}" data-event-opts="{{[['tap',[['increase',['$event','$0'],[[['goodsList','',index]]]]]]]}}" bindtap="__e"><text class="iconfont icon-jia"></text><view class="click-event"></view></view></block></block><block wx:else><view class="num-action" id="{{'cart-num-'+index}}" data-event-opts="{{[['tap',[['increase',['$event','$0',0],[[['goodsList','',index]]]]]]]}}" bindtap="__e"><text class="iconfont icon-jia"></text><view class="click-event"></view></view></block></block></block></block></block></view></block><block wx:if="{{value.template==3}}"><view class="right-wrap"><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['goodsList','',index]]]]]]]}}" class="color-base-bg select-sku" bindtap="__e">立即购买</view></view></block></view></view></view></block></view></block></block></block></block></view>
\ No newline at end of file
diff --git a/components/hover-nav/hover-nav.wxml b/components/hover-nav/hover-nav.wxml
index 219f958..13d888a 100644
--- a/components/hover-nav/hover-nav.wxml
+++ b/components/hover-nav/hover-nav.wxml
@@ -1,27 +1 @@
-<block wx:if="{{pageCount==1||need}}">
-    <view class="fixed-box" style="{{'height:'+(fixBtnShow?'330rpx':'120rpx')+';'}}">
-        <block>
-            <button data-event-opts="{{[['tap',[['modifyInfo']]]]}}" class="btn-item btn-lang"
-                style="{{'background:#c6251b;color:#fff;'+'background-image:'+('url('+(kefuimg?kefuimg:'')+')')+';'+('background-size:'+('100% 100%')+';')}}"
-                catchtap="__e">{{''+(langIndex==0 && isCn? 'EN':'CN')+''}}</button>
-        </block>        
-        <block wx:if="{{fixBtnShow}}">
-            <button class="btn-item"
-                style="{{'background:#c6251b;color:#fff;'+'background-image:'+('url('+(kefuimg?kefuimg:'')+')')+';'+('background-size:'+('100% 100%')+';')}}"
-                hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true">
-                <block wx:if="{{!kefuimg}}">
-                    <text class="icox icox-kefu" style="color:#fff;"></text>
-                </block>
-            </button>
-        </block>
-        <block wx:if="{{fixBtnShow&&mobile}}">
-            <view data-event-opts="{{[['tap',[['call']]]]}}" class="btn-item"
-                style="{{'background:#c6251b;color:#fff;'+'background-image:'+('url('+(phoneimg?phoneimg:'')+')')+';'+('background-size:'+('100% 100%')+';')}}"
-                bindtap="__e">
-                <block wx:if="{{!phoneimg}}">
-                    <text class="iconfont icon-dianhua" style="color:#fff;"></text>
-                </block>
-            </view>
-        </block>
-    </view>
-</block>
\ No newline at end of file
+<block wx:if="{{pageCount==1||need}}"><view class="fixed-box" style="{{'height:'+(fixBtnShow?'330rpx':'120rpx')+';'}}"><block><button data-event-opts="{{[['tap',[['modifyInfo']]]]}}" class="btn-item btn-lang" style="{{'background:#c6251b;color:#fff;'+'background-image:'+('url('+(kefuimg?kefuimg:'')+')')+';'+('background-size:'+('100% 100%')+';')}}" catchtap="__e">{{''+(langIndex==0 && isCn? 'EN':'CN')+''}}</button></block><block wx:if="{{fixBtnShow}}"><button class="btn-item" style="{{'background:#c6251b;color:#fff;'+'background-image:'+('url('+(kefuimg?kefuimg:'')+')')+';'+('background-size:'+('100% 100%')+';')}}" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true"><block wx:if="{{!kefuimg}}"><text class="icox icox-kefu" style="color:#fff;"></text></block></button></block><block wx:if="{{fixBtnShow&&mobile}}"><view data-event-opts="{{[['tap',[['call']]]]}}" class="btn-item" style="{{'background:#c6251b;color:#fff;'+'background-image:'+('url('+(phoneimg?phoneimg:'')+')')+';'+('background-size:'+('100% 100%')+';')}}" bindtap="__e"><block wx:if="{{!phoneimg}}"><text class="iconfont icon-dianhua" style="color:#fff;"></text></block></view></block></view></block>
\ No newline at end of file
diff --git a/components/ns-goods-action-icon/ns-goods-action-icon.wxml b/components/ns-goods-action-icon/ns-goods-action-icon.wxml
index 541247d..839aa3c 100644
--- a/components/ns-goods-action-icon/ns-goods-action-icon.wxml
+++ b/components/ns-goods-action-icon/ns-goods-action-icon.wxml
@@ -1,30 +1 @@
-<view>
-    <block wx:if="{{text=='客服' || text=='Contact'}}">
-        <block>
-            <button class="action-icon-wrap" style="background:transparent;padding:0;margin:0;"
-                hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true">
-                <view class="{{['iconfont','color-title',icon]}}"></view>
-                <text>{{text}}</text>
-                <block wx:if="{{$root.g0}}">
-                    <view class="corner-mark color-base-bg"
-                        style="{{'background:'+(cornerMarkBg+'!important')+';'+('color:'+(cornerMarkColor)+';')}}">
-                        {{cornerMark}}</view>
-                </block>
-            </button>
-        </block>
-    </block>
-    <block wx:else>
-        <block>
-            <view data-event-opts="{{[['tap',[['clickEvent',['$event']]]]]}}"
-                class="action-icon-wrap" bindtap="__e">
-                <view class="{{['iconfont','',icon]}}"></view>
-                <text>{{text}}</text>
-                <block wx:if="{{$root.g1}}">
-                    <view class="{{['corner-mark','color-base-bg',($root.m0>99)?'max':'']}}"
-                        style="{{'background:'+(cornerMarkBg+'!important')+';'+('color:'+(cornerMarkColor)+';')}}">
-                        {{cornerMark>99?'99+':cornerMark}}</view>
-                </block>
-            </view>
-        </block>
-    </block>
-</view>
\ No newline at end of file
+<view><block wx:if="{{text=='客服' || text=='Contact'}}"><block><button class="action-icon-wrap" style="background:transparent;padding:0;margin:0;" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true"><view class="{{['iconfont','color-title',icon]}}"></view><text>{{text}}</text><block wx:if="{{$root.g0}}"><view class="corner-mark color-base-bg" style="{{'background:'+(cornerMarkBg+'!important')+';'+('color:'+(cornerMarkColor)+';')}}">{{cornerMark}}</view></block></button></block></block><block wx:else><block><view data-event-opts="{{[['tap',[['clickEvent',['$event']]]]]}}" class="action-icon-wrap" bindtap="__e"><view class="{{['iconfont','',icon]}}"></view><text>{{text}}</text><block wx:if="{{$root.g1}}"><view class="{{['corner-mark','color-base-bg',($root.m0>99)?'max':'']}}" style="{{'background:'+(cornerMarkBg+'!important')+';'+('color:'+(cornerMarkColor)+';')}}">{{cornerMark>99?'99+':cornerMark}}</view></block></view></block></block></view>
\ No newline at end of file
diff --git a/components/wx-privacy-popup/privacy-popup.wxml b/components/wx-privacy-popup/privacy-popup.wxml
index ca06f37..b808712 100644
--- a/components/wx-privacy-popup/privacy-popup.wxml
+++ b/components/wx-privacy-popup/privacy-popup.wxml
@@ -1,2 +1 @@
-<block wx:if="{{showPop}}"><view class="data-v-2e10602c"><view class="privacy-mask data-v-2e10602c"><view class="privacy-wrap data-v-2e10602c"><view class="privacy-title data-v-2e10602c">用户隐私保护提示</view><view class="privacy-desc data-v-2e10602c">感谢您使用本小程序，在使用前您应当阅读并同意<text data-event-opts="{{[['tap',[['openPrivacyContract',['$event']]]]]}}" class="privacy-link data-v-2e10602c" bindtap="__e">{{privacyContractName}}</text>，
-				当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用小程序相关功能。</view><view class="privacy-button-flex data-v-2e10602c"><button data-event-opts="{{[['tap',[['handleDisagree',['$event']]]]]}}" class="privacy-button-btn bg-disagree data-v-2e10602c" bindtap="__e">不同意</button><button class="privacy-button-btn bg-agree data-v-2e10602c" id="agree-btn" open-type="agreePrivacyAuthorization" data-event-opts="{{[['agreeprivacyauthorization',[['handleAgree',['$event']]]]]}}" bindagreeprivacyauthorization="__e">同意并继续</button></view></view></view></view></block>
\ No newline at end of file
+<block wx:if="{{showPop}}"><view class="data-v-2e10602c"><view class="privacy-mask data-v-2e10602c"><view class="privacy-wrap data-v-2e10602c"><view class="privacy-title data-v-2e10602c">用户隐私保护提示</view><view class="privacy-desc data-v-2e10602c">感谢您使用本小程序，在使用前您应当阅读并同意<text data-event-opts="{{[['tap',[['openPrivacyContract',['$event']]]]]}}" class="privacy-link data-v-2e10602c" bindtap="__e">{{privacyContractName}}</text>， 当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用小程序相关功能。</view><view class="privacy-button-flex data-v-2e10602c"><button data-event-opts="{{[['tap',[['handleDisagree',['$event']]]]]}}" class="privacy-button-btn bg-disagree data-v-2e10602c" bindtap="__e">不同意</button><button class="privacy-button-btn bg-agree data-v-2e10602c" id="agree-btn" open-type="agreePrivacyAuthorization" data-event-opts="{{[['agreeprivacyauthorization',[['handleAgree',['$event']]]]]}}" bindagreeprivacyauthorization="__e">同意并继续</button></view></view></view></view></block>
\ No newline at end of file
diff --git a/pages/goods/detail.wxml b/pages/goods/detail.wxml
index e72074b..6397cb3 100644
--- a/pages/goods/detail.wxml
+++ b/pages/goods/detail.wxml
@@ -1,650 +1 @@
-<page-meta page-style="{{themeColor}}" class="data-v-13d744e7"></page-meta>
-<view class="data-v-13d744e7">
-    <goods-detail-view vue-id="6db62043-1" goodsSkuDetail="{{goodsSkuDetail}}"
-        data-ref="goodsDetailView" class="data-v-13d744e7 vue-ref" bind:__l="__l"
-        vue-slots="{{['price','skuspec','business','action']}}">
-        <view slot="price">
-            <block wx:if="{{showDiscount&&goodsSkuDetail.discountTimeMachine}}">
-                <view class="goods-promotion data-v-13d744e7">
-                    <view class="price-info data-v-13d744e7">
-                        <view class="icon-box data-v-13d744e7">
-                            <text class="iconfont icon-tutechan data-v-13d744e7"></text>
-                        </view>
-                        <view class="price-box data-v-13d744e7">
-                            <view class="promotion-text data-v-13d744e7">限时折扣</view>
-                            <block wx:if="{{goodsSkuDetail.sale_show}}">
-                                <view class="sale-num data-v-13d744e7">
-                                    {{"已售"+goodsSkuDetail.sale_num+goodsSkuDetail.unit}}</view>
-                            </block>
-                        </view>
-                    </view>
-                    <view class="countdown data-v-13d744e7">
-                        <view class="txt data-v-13d744e7">距结束仅剩</view>
-                        <view class="clockrun data-v-13d744e7">
-                            <uni-count-down vue-id="{{('6db62043-2')+','+('6db62043-1')}}"
-                                day="{{goodsSkuDetail.discountTimeMachine.d}}"
-                                hour="{{goodsSkuDetail.discountTimeMachine.h}}"
-                                minute="{{goodsSkuDetail.discountTimeMachine.i}}"
-                                second="{{goodsSkuDetail.discountTimeMachine.s}}"
-                                splitorColor="#ffffff" backgroundColor="#ffffff"
-                                class="data-v-13d744e7" bind:__l="__l"></uni-count-down>
-                        </view>
-                    </view>
-                </view>
-            </block>
-            <view class="group-wrap padding-top data-v-13d744e7">
-                <view class="goods-module-wrap data-v-13d744e7">
-                    <block wx:if="{{goodsSkuDetail.isinformation==0}}">
-                        <block class="data-v-13d744e7">
-                            <block wx:if="{{showDiscount}}">
-                                <text class="price-symbol price-font data-v-13d744e7">{{$root.m0}}</text>
-                                <text class="price price-font data-v-13d744e7">{{$root.g0[0]}}</text>
-                                <text class="price-symbol price-font data-v-13d744e7">
-                                    {{"."+$root.g1[1]}}</text>
-                            </block>
-                            <block wx:else>
-                                <block wx:if="{{goodsSkuDetail.member_price>0}}">
-                                    <text class="price-symbol price-font data-v-13d744e7">
-                                        {{$root.m1}}</text>
-                                    <text class="price price-font data-v-13d744e7">{{$root.g2[0]}}</text>
-                                    <text class="price-symbol price-font data-v-13d744e7">
-                                        {{"."+$root.g3[1]}}</text>
-                                    <view class="member-vip-wrap data-v-13d744e7">
-                                        <image src="{{$root.g4}}" mode="aspectFit"
-                                            class="data-v-13d744e7"></image>
-                                    </view>
-                                    <block wx:if="{{!goodsSkuDetail.market_price_show}}">
-                                        <view class="member-price-wrap data-v-13d744e7">
-                                            <text class="unit price-font data-v-13d744e7">原价</text>
-                                            <text class="unit price-font data-v-13d744e7">
-                                                {{$root.m2}}</text>
-                                            <text class="money price-font data-v-13d744e7">
-                                                {{goodsSkuDetail.price}}</text>
-                                        </view>
-                                    </block>
-                                </block>
-                                <block wx:else>
-                                    <text class="price-symbol price-font data-v-13d744e7">
-                                        {{$root.m3}}</text>
-                                    <text class="price price-font data-v-13d744e7">{{$root.g5[0]}}</text>
-                                    <text class="price-symbol price-font data-v-13d744e7">
-                                        {{"."+$root.g6[1]}}</text>
-                                </block>
-                            </block>
-                            <block wx:if="{{goodsSkuDetail.market_price_show}}">
-                                <view class="market-price-wrap data-v-13d744e7">
-                                    <block
-                                        wx:if="{{showDiscount&&goodsSkuDetail.price>0||goodsSkuDetail.market_price>0}}">
-                                        <text class="unit price-font data-v-13d744e7">
-                                            {{''+$root.m4+''}}</text>
-                                    </block>
-                                    <block wx:if="{{showDiscount&&goodsSkuDetail.price>0}}">
-                                        <text class="money price-font data-v-13d744e7">
-                                            {{goodsSkuDetail.price}}</text>
-                                    </block>
-                                    <block wx:else>
-                                        <block wx:if="{{goodsSkuDetail.market_price>0}}">
-                                            <text class="money price-font data-v-13d744e7">
-                                                {{goodsSkuDetail.market_price}}</text>
-                                        </block>
-                                    </block>
-                                </view>
-                            </block>
-                            <view class="follow-and-share data-v-13d744e7">
-                                <text data-event-opts="{{[['tap',[['openSharePopup']]]]}}"
-                                    class="follow iconfont icon-share data-v-13d744e7" bindtap="__e"></text>
-                                <text data-event-opts="{{[['tap',[['editCollection']]]]}}"
-                                    class="{{['share','iconfont','data-v-13d744e7',whetherCollection==1?'icon-likefill color-base-text':'icon-guanzhu']}}"
-                                    bindtap="__e"></text>
-                            </view>
-                        </block>
-                    </block>
-                    <block wx:else>
-                        <block class="data-v-13d744e7">
-                            <text class="price price-font data-v-13d744e7" style="font-weight:600;">
-                                {{$root.m5}}</text>
-                        </block>
-                    </block>
-                </view>
-                <view class="goods-module-wrap info data-v-13d744e7">
-                    <text class="sku-name-wrap data-v-13d744e7">{{goodsSkuDetail.goods_name}}</text>
-                    <block wx:if="{{goodsSkuDetail.introduction}}">
-                        <text class="introduction data-v-13d744e7"
-                            style="{{'color:'+(goodsSkuDetail.config?goodsSkuDetail.config.introduction_color:'')+';'}}">
-                            {{''+goodsSkuDetail.introduction+''}}</text>
-                    </block>
-                    <block wx:if="{{goodsSkuDetail.label_name}}">
-                        <view class="goods-tag-list data-v-13d744e7">
-                            <text class="tag-item data-v-13d744e7">{{goodsSkuDetail.label_name}}</text>
-                        </view>
-                    </block>
-                    <view class="logistics-wrap data-v-13d744e7">
-                        <block
-                            wx:if="{{goodsSkuDetail.stock_show&&goodsSkuDetail.isinformation!=1}}">
-                            <text class="data-v-13d744e7">{{$root.m6+":
-                                "+(goodsSkuDetail.stock+goodsSkuDetail.unit)}}</text>
-                        </block>
-                        <block wx:if="{{goodsSkuDetail.sale_show&&goodsSkuDetail.isinformation!=1}}">
-                            <text class="data-v-13d744e7">{{$root.m7+":
-                                "+(goodsSkuDetail.sale_num+goodsSkuDetail.unit)}}</text>
-                        </block>
-                    </view>
-                </view>
-            </view>
-            <view class="group-wrap data-v-13d744e7">
-                <ns-goods-promotion vue-id="{{('6db62043-3')+','+('6db62043-1')}}"
-                    promotion="discount" data-ref="goodsPromotion" class="data-v-13d744e7 vue-ref"
-                    bind:__l="__l"></ns-goods-promotion>
-            </view>
-            <block
-                wx:if="{{goodsSkuDetail.fenxiao_detail&&goodsSkuDetail.fenxiao_detail.words_account&&goodsSkuDetail.fenxiao_detail.commission_money>0&&goodsSkuDetail.fenxiao_detail.is_commission_money==1}}">
-                <view class="group-wrap fenxiao-detail data-v-13d744e7">
-                    <view class="title color-base-text data-v-13d744e7">{{$root.m8}}</view>
-                    <view class="commission-ratio data-v-13d744e7">
-                        <view class="item data-v-13d744e7">
-                            <view class="data-v-13d744e7">{{"One "+$root.m9}}</view>
-                            <view class="price-color data-v-13d744e7">
-                                <text class="unit data-v-13d744e7">￥</text>
-                                <text class="money data-v-13d744e7">{{$root.g7[0]}}</text>
-                                <text class="unit data-v-13d744e7">{{"."+$root.g8[1]}}</text>
-                            </view>
-                        </view>
-                    </view>
-                </view>
-            </block>
-        </view>
-        <view data-event-opts="{{[['tap',[['buyNow']]]]}}"
-            class="item selected-sku-spec data-v-13d744e7" bindtap="__e" slot="skuspec">
-            <view class="label data-v-13d744e7">{{$root.m10}}</view>
-            <view class="box data-v-13d744e7">
-                <block wx:for="{{goodsSkuDetail.sku_spec_format}}" wx:for-item="item"
-                    wx:for-index="index" wx:key="index">
-                    <text class="data-v-13d744e7">{{item.spec_name+"/"+item.spec_value_name}}</text>
-                </block>
-            </view>
-            <text class="iconfont iconright data-v-13d744e7"></text>
-        </view>
-        <view slot="business">
-            <block wx:if="{{goodsSkuDetail.goods_id}}">
-                <ns-goods-sku vue-id="{{('6db62043-4')+','+('6db62043-1')}}"
-                    goods-id="{{goodsSkuDetail.goods_id}}" goods-detail="{{goodsSkuDetail}}"
-                    max-buy="{{goodsSkuDetail.max_buy}}" min-buy="{{goodsSkuDetail.min_buy}}"
-                    data-ref="goodsSku"
-                    data-event-opts="{{[['^refresh',[['refreshGoodsSkuDetail']]],['^getSkuId',[['setSkuId']]]]}}"
-                    bind:refresh="__e" bind:getSkuId="__e" class="data-v-13d744e7 vue-ref"
-                    bind:__l="__l"></ns-goods-sku>
-            </block>
-            <block wx:if="{{$root.g9}}">
-                <view class="data-v-13d744e7">
-                    <view data-event-opts="{{[['tap',[['openBundlingPopup']]]]}}"
-                        class="group-wrap data-v-13d744e7" bindtap="__e">
-                        <view data-event-opts="{{[['tap',[['openBundlingPopup']]]]}}"
-                            class="goods-cell data-v-13d744e7" bindtap="__e">
-                            <view class="box data-v-13d744e7">
-                                <text class="tit data-v-13d744e7">组合套餐</text>
-                                <text class="data-v-13d744e7">{{bundling[0].bl_name}}</text>
-                            </view>
-                            <text class="iconfont icon-right data-v-13d744e7"></text>
-                        </view>
-                        <scroll-view class="combo-goods-wrap color-tip data-v-13d744e7"
-                            scroll-x="true">
-                            <view class="goods-wrap data-v-13d744e7">
-                                <block wx:if="{{bundlingType==true}}">
-                                    <view
-                                        data-event-opts="{{[['tap',[['toGoodsDetail',['$0'],['skuId']]]]]}}"
-                                        class="goods-item data-v-13d744e7" bindtap="__e">
-                                        <view class="combo-img data-v-13d744e7">
-                                            <image src="{{$root.g10}}"
-                                                data-event-opts="{{[['error',[['imageError']]]]}}"
-                                                binderror="__e" class="data-v-13d744e7"></image>
-                                            <view class="price-wrap data-v-13d744e7">
-                                                <text class="unit price-font data-v-13d744e7">
-                                                    {{$root.m11}}</text>
-                                                <text class="price price-font data-v-13d744e7">
-                                                    {{goodsSkuDetail.price}}</text>
-                                            </view>
-                                        </view>
-                                        <text class="name data-v-13d744e7">
-                                            {{goodsSkuDetail.goods_name}}</text>
-                                    </view>
-                                </block>
-                                <block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index"
-                                    wx:key="index">
-                                    <block class="data-v-13d744e7">
-                                        <block wx:if="{{index<3}}">
-                                            <view
-                                                data-event-opts="{{[['tap',[['toGoodsDetail',['$0'],[[['bundling.__$n0.bundling_goods','',index,'sku_id']]]]]]]}}"
-                                                class="goods-item data-v-13d744e7" bindtap="__e">
-                                                <view class="combo-img data-v-13d744e7">
-                                                    <image src="{{item.g11}}"
-                                                        data-event-opts="{{[['error',[['bundlingImageError',[0,index]]]]]}}"
-                                                        binderror="__e" class="data-v-13d744e7"></image>
-                                                    <view class="price-wrap data-v-13d744e7">
-                                                        <text
-                                                            class="unit price-font data-v-13d744e7">
-                                                            {{item.m12}}</text>
-                                                        <text
-                                                            class="price price-font data-v-13d744e7">
-                                                            {{item.$orig.price}}</text>
-                                                    </view>
-                                                </view>
-                                                <text class="name data-v-13d744e7">
-                                                    {{item.$orig.sku_name}}</text>
-                                            </view>
-                                        </block>
-                                    </block>
-                                </block>
-                            </view>
-                        </scroll-view>
-                    </view>
-                    <view data-event-opts="{{[['touchmove',[['',['$event']]]]]}}"
-                        catchtouchmove="__e" class="data-v-13d744e7">
-                        <uni-popup vue-id="{{('6db62043-5')+','+('6db62043-1')}}" type="bottom"
-                            data-ref="bundlingPopup" class="data-v-13d744e7 vue-ref" bind:__l="__l"
-                            vue-slots="{{['default']}}">
-                            <view class="bundling-popup-layer popup-layer data-v-13d744e7">
-                                <view data-event-opts="{{[['tap',[['closeBundlingPopup']]]]}}"
-                                    class="head-wrap data-v-13d744e7" bindtap="__e">
-                                    <text class="data-v-13d744e7">组合套餐</text>
-                                    <text class="iconfont icon-close data-v-13d744e7"></text>
-                                </view>
-                                <scroll-view class="bundling-body data-v-13d744e7"
-                                    scroll-y="{{true}}">
-                                    <view class="bundling-view data-v-13d744e7">
-                                        <block wx:for="{{$root.l2}}" wx:for-item="item"
-                                            wx:for-index="index" wx:key="index">
-                                            <block class="data-v-13d744e7">
-                                                <view class="bundling-item data-v-13d744e7">
-                                                    <view
-                                                        data-event-opts="{{[['tap',[['toComoDetail',['$0'],[[['bundling','',index,'bl_id']]]]]]]}}"
-                                                        class="title data-v-13d744e7" bindtap="__e">
-                                                        <text class="data-v-13d744e7">
-                                                            {{item.$orig.bl_name}}</text>
-                                                        <text
-                                                            class="iconfont icon-right data-v-13d744e7"></text>
-                                                    </view>
-                                                    <scroll-view scroll-x="{{true}}"
-                                                        class="data-v-13d744e7">
-                                                        <view class="goods-wrap data-v-13d744e7">
-                                                            <view
-                                                                data-event-opts="{{[['tap',[['toGoodsDetail',['$0'],['skuId']]]]]}}"
-                                                                class="goods-item data-v-13d744e7"
-                                                                bindtap="__e">
-                                                                <view
-                                                                    class="combo-img data-v-13d744e7">
-                                                                    <image src="{{item.g12}}"
-                                                                        data-event-opts="{{[['error',[['imageError']]]]}}"
-                                                                        binderror="__e"
-                                                                        class="data-v-13d744e7"></image>
-                                                                    <view
-                                                                        class="price-wrap data-v-13d744e7">
-                                                                        <text
-                                                                            class="unit price-font data-v-13d744e7">
-                                                                            {{item.m13}}</text>
-                                                                        <text
-                                                                            class="price price-font data-v-13d744e7">
-                                                                            {{goodsSkuDetail.price}}</text>
-                                                                    </view>
-                                                                </view>
-                                                                <text class="name data-v-13d744e7">
-                                                                    {{goodsSkuDetail.goods_name}}</text>
-                                                            </view>
-                                                            <block wx:for="{{item.l1}}"
-                                                                wx:for-item="goods"
-                                                                wx:for-index="goods_index"
-                                                                wx:key="goods_index">
-                                                                <block class="data-v-13d744e7">
-                                                                    <block wx:if="{{goods_index<3}}">
-                                                                        <view
-                                                                            data-event-opts="{{[['tap',[['toGoodsDetail',['$0'],[[['bundling','',index],['bundling_goods','',goods_index,'sku_id']]]]]]]}}"
-                                                                            class="goods-item data-v-13d744e7"
-                                                                            bindtap="__e">
-                                                                            <view
-                                                                                class="combo-img data-v-13d744e7">
-                                                                                <image
-                                                                                    src="{{goods.g13}}"
-                                                                                    data-event-opts="{{[['error',[['bundlingImageError',[index,goods_index]]]]]}}"
-                                                                                    binderror="__e"
-                                                                                    class="data-v-13d744e7"></image>
-                                                                                <view
-                                                                                    class="price-wrap data-v-13d744e7">
-                                                                                    <text
-                                                                                        class="unit price-font data-v-13d744e7">
-                                                                                        {{goods.m14}}</text>
-                                                                                    <text
-                                                                                        class="price price-font data-v-13d744e7">
-                                                                                        {{goods.$orig.price}}</text>
-                                                                                </view>
-                                                                            </view>
-                                                                            <text
-                                                                                class="name data-v-13d744e7">
-                                                                                {{goods.$orig.sku_name}}</text>
-                                                                        </view>
-                                                                    </block>
-                                                                </block>
-                                                            </block>
-                                                        </view>
-                                                    </scroll-view>
-                                                    <view
-                                                        class="bundling-price-wrap data-v-13d744e7">
-                                                        <text class="label data-v-13d744e7">套餐价</text>
-                                                        <text
-                                                            class="unit price-color data-v-13d744e7">
-                                                            {{item.m15}}</text>
-                                                        <text
-                                                            class="price price-color data-v-13d744e7">
-                                                            {{item.$orig.bl_price}}</text>
-                                                        <button class="mini data-v-13d744e7"
-                                                            type="primary" size="mini"
-                                                            data-event-opts="{{[['tap',[['toComoDetail',['$0'],[[['bundling','',index,'bl_id']]]]]]]}}"
-                                                            bindtap="__e">立即购买</button>
-                                                    </view>
-                                                </view>
-                                            </block>
-                                        </block>
-                                    </view>
-                                </scroll-view>
-                            </view>
-                        </uni-popup>
-                    </view>
-                </view>
-            </block>
-            <view data-event-opts="{{[['touchmove',[['',['$event']]]]]}}" catchtouchmove="__e"
-                class="data-v-13d744e7">
-                <uni-popup vue-id="{{('6db62043-6')+','+('6db62043-1')}}" type="bottom"
-                    data-ref="couponPopup" class="data-v-13d744e7 vue-ref" bind:__l="__l"
-                    vue-slots="{{['default']}}">
-                    <view class="goods-coupon-popup-layer popup-layer data-v-13d744e7">
-                        <view data-event-opts="{{[['tap',[['closeCouponPopup']]]]}}"
-                            class="head-wrap data-v-13d744e7" bindtap="__e">
-                            <text class="data-v-13d744e7">优惠券</text>
-                            <text class="iconfont icon-close data-v-13d744e7"></text>
-                        </view>
-                        <scroll-view class="coupon-body data-v-13d744e7" scroll-y="{{true}}">
-                            <block wx:for="{{$root.l3}}" wx:for-item="item" wx:for-index="index"
-                                wx:key="index">
-                                <block wx:if="{{hackReset}}">
-                                    <view
-                                        class="coupon-item ns-gradient-diy-goods-list data-v-13d744e7">
-                                        <view class="coupon-info data-v-13d744e7"
-                                            style="{{'background-color:'+(item.$orig.useState==2?'#F2F2F2':'var(--main-color-shallow)')+';'}}">
-                                            <view
-                                                class="{{['info-wrap','data-v-13d744e7',(item.$orig.useState==2)?'disabled':'']}}">
-                                                <image class="coupon-line data-v-13d744e7"
-                                                    mode="heightFix" src="{{$root.g14}}"></image>
-                                                <view class="coupon-money data-v-13d744e7">
-                                                    <block wx:if="{{item.$orig.type=='reward'}}">
-                                                        <text class="unit data-v-13d744e7">
-                                                            {{item.m16}}</text>
-                                                        <text class="money data-v-13d744e7">
-                                                            {{item.m17}}</text>
-                                                    </block>
-                                                    <block wx:else>
-                                                        <block
-                                                            wx:if="{{item.$orig.type=='discount'}}">
-                                                            <text class="money data-v-13d744e7">
-                                                                {{item.m18}}</text>
-                                                            <text class="unit data-v-13d744e7">折</text>
-                                                        </block>
-                                                    </block>
-                                                    <view class="at-least data-v-13d744e7">
-                                                        <block wx:if="{{item.$orig.at_least>0}}">
-                                                            {{'满'+item.$orig.at_least+'可用'}}</block>
-                                                        <block wx:else>无门槛</block>
-                                                    </view>
-                                                </view>
-                                            </view>
-                                            <view class="desc-wrap data-v-13d744e7">
-                                                <view class="coupon-name data-v-13d744e7">
-                                                    {{item.$orig.coupon_name}}</view>
-                                                <block
-                                                    wx:if="{{item.$orig.type=='discount'&&item.$orig.discount_limit>0}}">
-                                                    <view class="limit data-v-13d744e7">
-                                                        {{"最多可抵￥"+item.$orig.discount_limit}}</view>
-                                                </block>
-                                                <block wx:if="{{item.$orig.validity_type==0}}">
-                                                    <view
-                                                        class="time font-size-goods-tag data-v-13d744e7">
-                                                        {{"有效期："+item.g15}}</view>
-                                                </block>
-                                                <block wx:else>
-                                                    <block wx:if="{{item.$orig.validity_type==1}}">
-                                                        <view
-                                                            class="time font-size-goods-tag data-v-13d744e7">
-                                                            {{"有效期：领取之日起"+item.$orig.fixed_term+"天内有效"}}</view>
-                                                    </block>
-                                                    <block wx:else>
-                                                        <view
-                                                            class="time font-size-goods-tag data-v-13d744e7">
-                                                            有效期：长期有效</view>
-                                                    </block>
-                                                </block>
-                                            </view>
-                                            <block wx:if="{{item.$orig.useState==2}}">
-                                                <button type="primary" disabled="{{true}}"
-                                                    class="data-v-13d744e7">已抢光</button>
-                                            </block>
-                                            <block wx:else>
-                                                <block wx:if="{{item.$orig.useState==1}}">
-                                                    <button type="primary" disabled="{{true}}"
-                                                        class="data-v-13d744e7">已领取</button>
-                                                </block>
-                                                <block wx:else>
-                                                    <button type="primary"
-                                                        data-event-opts="{{[['tap',[['receiveCoupon',['$0'],[[['couponList','',index]]]]]]]}}"
-                                                        bindtap="__e" class="data-v-13d744e7">领取</button>
-                                                </block>
-                                            </block>
-                                        </view>
-                                    </view>
-                                </block>
-                            </block>
-                        </scroll-view>
-                        <view class="button-box data-v-13d744e7">
-                            <button type="primary"
-                                data-event-opts="{{[['tap',[['closeCouponPopup']]]]}}" bindtap="__e"
-                                class="data-v-13d744e7">确定</button>
-                        </view>
-                    </view>
-                </uni-popup>
-            </view>
-            <block wx:if="{{addonIsExist.manjian}}">
-                <view data-event-opts="{{[['touchmove',[['',['$event']]]]]}}" catchtouchmove="__e"
-                    class="data-v-13d744e7">
-                    <uni-popup vue-id="{{('6db62043-7')+','+('6db62043-1')}}" type="bottom"
-                        data-ref="manjianPopup" class="data-v-13d744e7 vue-ref" bind:__l="__l"
-                        vue-slots="{{['default']}}">
-                        <view class="manjian-popup-layer popup-layer data-v-13d744e7">
-                            <view data-event-opts="{{[['tap',[['closeManjianPopup']]]]}}"
-                                class="head-wrap data-v-13d744e7" bindtap="__e">
-                                <text class="data-v-13d744e7">促销</text>
-                                <text class="iconfont icon-close data-v-13d744e7"></text>
-                            </view>
-                            <scroll-view class="manjian-body data-v-13d744e7" scroll-y="{{true}}">
-                                <block wx:if="{{manjian.manjian!=undefined}}">
-                                    <view class="item data-v-13d744e7" style="display:flex;">
-                                        <view
-                                            class="free-tip color-base-text color-base-border data-v-13d744e7">
-                                            满减</view>
-                                        <text class="font-size-base data-v-13d744e7">
-                                            {{manjian.manjian}}</text>
-                                    </view>
-                                </block>
-                                <block wx:if="{{manjian.mansong!=undefined}}">
-                                    <view class="item data-v-13d744e7">
-                                        <text
-                                            class="free-tip color-base-text color-base-border data-v-13d744e7">
-                                            满送</text>
-                                        <text class="font-size-base data-v-13d744e7">
-                                            {{manjian.mansong}}</text>
-                                    </view>
-                                </block>
-                                <block wx:if="{{manjian.free_shipping!=undefined}}">
-                                    <view class="item data-v-13d744e7" style="display:flex;">
-                                        <view
-                                            class="free-tip color-base-text color-base-border data-v-13d744e7">
-                                            包邮</view>
-                                        <text class="font-size-base data-v-13d744e7">
-                                            {{manjian.free_shipping}}</text>
-                                    </view>
-                                </block>
-                            </scroll-view>
-                            <view class="button-box data-v-13d744e7">
-                                <button type="primary"
-                                    data-event-opts="{{[['tap',[['closeManjianPopup']]]]}}"
-                                    bindtap="__e" class="data-v-13d744e7">确定</button>
-                            </view>
-                        </view>
-                    </uni-popup>
-                </view>
-            </block>
-            <view data-event-opts="{{[['touchmove',[['',['$event']]]]]}}"
-                class="goods-sku data-v-13d744e7" catchtouchmove="__e">
-                <uni-popup vue-id="{{('6db62043-8')+','+('6db62043-1')}}" type="bottom"
-                    data-ref="informationPopup" class="data-v-13d744e7 vue-ref" bind:__l="__l"
-                    vue-slots="{{['default']}}">
-                    <view class="manjian-popup-layer popup-layer data-v-13d744e7"
-                        style="{{'height:'+(FormHeight)+';'}}">
-                        <view data-event-opts="{{[['tap',[['closeinformationPopup']]]]}}"
-                            class="head-wrap data-v-13d744e7" bindtap="__e">
-                            <text class="data-v-13d744e7">商品留言</text>
-                            <text class="iconfont icon-close data-v-13d744e7"></text>
-                        </view>
-                        <scroll-view class="manjian-body data-v-13d744e7" scroll-y="{{true}}">
-                            <view style="padding:0 30rpx;" class="data-v-13d744e7">
-                                <ns-form vue-id="{{('6db62043-9')+','+('6db62043-8')}}"
-                                    data="{{informationform}}" data-ref="form"
-                                    class="data-v-13d744e7 vue-ref" bind:__l="__l"></ns-form>
-                            </view>
-                        </scroll-view>
-                        <view class="button-box data-v-13d744e7">
-                            <button type="primary"
-                                data-event-opts="{{[['tap',[['saveubfirnation']]]]}}" bindtap="__e"
-                                class="data-v-13d744e7">确定</button>
-                        </view>
-                    </view>
-                </uni-popup>
-            </view>
-        </view>
-        <ns-goods-action vue-id="{{('6db62043-10')+','+('6db62043-1')}}" safeArea="{{isIphoneX}}"
-            class="data-v-13d744e7" slot="action" bind:__l="__l" vue-slots="{{['default']}}">
-            <block wx:if="{{goodsSkuDetail.goods_state==1}}">
-                <block
-                    wx:if="{{goodsSkuDetail.store_goods_status!=undefined&&goodsSkuDetail.store_goods_status!=1}}">
-                    <ns-goods-action-button class="goods-action-button active3 data-v-13d744e7"
-                        vue-id="{{('6db62043-11')+','+('6db62043-10')}}"
-                        disabled-text="{{$root.m19}}" disabled="{{true}}" bind:__l="__l"></ns-goods-action-button>
-                </block>
-                <block wx:else>
-                    <block class="data-v-13d744e7">
-                        <block wx:if="{{goodsSkuDetail.isinformation!=1}}">
-                            <ns-goods-action-icon vue-id="{{('6db62043-12')+','+('6db62043-10')}}"
-                                text="{{$root.m20}}" icon="icon-shouye1"
-                                data-event-opts="{{[['^click',[['goHome']]]]}}" bind:click="__e"
-                                class="data-v-13d744e7" bind:__l="__l"></ns-goods-action-icon>
-                        </block>
-                        <ns-goods-action-icon vue-id="{{('6db62043-13')+','+('6db62043-10')}}"
-                            text="{{$root.m21}}"
-                            cornerMarkBg="{{themeStyle.goods_detail.goods_cart_num_corner}}"
-                            icon="icon-gouwuche2" corner-mark="{{cartNumber>0?cartNumber+'':''}}"
-                            data-event-opts="{{[['^click',[['goCart']]]]}}" bind:click="__e"
-                            class="data-v-13d744e7" bind:__l="__l"></ns-goods-action-icon>
-                        <block wx:if="{{goodsSkuDetail.isinformation!=1}}">
-                            <ns-goods-action-icon vue-id="{{('6db62043-14')+','+('6db62043-10')}}"
-                                text="{{$root.m22}}" icon="icox icox-kefu"
-                                send-data="{{contactData}}" chatParam="{{chatRoomParams}}"
-                                class="data-v-13d744e7" bind:__l="__l"></ns-goods-action-icon>
-                        </block>
-                        <block wx:if="{{goodsSkuDetail.isinformation>=1}}">
-                            <block class="data-v-13d744e7">
-                                <block wx:if="{{goodsSkuDetail.isinformation==1}}">
-                                    <ns-goods-action-button
-                                        class="goods-action-button active3 data-v-13d744e7"
-                                        vue-id="{{('6db62043-15')+','+('6db62043-10')}}" disabled-text
-                                        backgroundColor="#54c952" text="{{$root.m23}}"
-                                        disabled="{{false}}"
-                                        data-event-opts="{{[['^click',[['phoneClick',['$0'],['goodsSkuDetail.goods_mobile']]]]]}}"
-                                        bind:click="__e" bind:__l="__l"></ns-goods-action-button>
-                                </block>
-                                <block wx:if="{{goodsSkuDetail.isinformation==2}}">
-                                    <ns-goods-action-button
-                                        class="goods-action-button active3 data-v-13d744e7"
-                                        vue-id="{{('6db62043-16')+','+('6db62043-10')}}" disabled-text
-                                        backgroundColor="#54c952" text="{{$root.m24}}"
-                                        disabled="{{false}}"
-                                        data-event-opts="{{[['^click',[['showinformation']]]]}}"
-                                        bind:click="__e" bind:__l="__l"></ns-goods-action-button>
-                                </block>
-                            </block>
-                        </block>
-                        <block wx:else>
-                            <block class="data-v-13d744e7">
-                                <block
-                                    wx:if="{{goodsSkuDetail.stock==0&&!goodsSkuDetail.sku_spec_format}}">
-                                    <block class="data-v-13d744e7">
-                                        <ns-goods-action-button
-                                            class="goods-action-button active3 data-v-13d744e7"
-                                            vue-id="{{('6db62043-17')+','+('6db62043-10')}}"
-                                            disabled-text="{{$root.m25}}" disabled="{{true}}"
-                                            bind:__l="__l"></ns-goods-action-button>
-                                    </block>
-                                </block>
-                                <block wx:else>
-                                    <block
-                                        wx:if="{{goodsSkuDetail.is_limit==1&&goodsSkuDetail.limit_type==2&&goodsSkuDetail.max_buy!=0&&goodsSkuDetail.purchased_num>=goodsSkuDetail.max_buy}}">
-                                        <block class="data-v-13d744e7">
-                                            <ns-goods-action-button
-                                                class="goods-action-button active3 data-v-13d744e7"
-                                                vue-id="{{('6db62043-18')+','+('6db62043-10')}}"
-                                                disabled-text="{{$root.m26}}" disabled="{{true}}"
-                                                bind:__l="__l"></ns-goods-action-button>
-                                        </block>
-                                    </block>
-                                    <block wx:else>
-                                        <block class="data-v-13d744e7">
-                                            <block wx:if="{{goodsSkuDetail.is_virtual==0}}">
-                                                <ns-goods-action-button
-                                                    class="goods-action-button data-v-13d744e7"
-                                                    vue-id="{{('6db62043-19')+','+('6db62043-10')}}"
-                                                    text="{{$root.m27}}"
-                                                    backgroundColor="{{themeStyle.goods_detail.goods_btn_color_shallow}}"
-                                                    data-event-opts="{{[['^click',[['joinCart']]]]}}"
-                                                    bind:click="__e" bind:__l="__l"></ns-goods-action-button>
-                                            </block>
-                                            <ns-goods-action-button
-                                                class="goods-action-button data-v-13d744e7"
-                                                vue-id="{{('6db62043-20')+','+('6db62043-10')}}"
-                                                backgroundColor="{{themeStyle.goods_detail.goods_btn_color}}"
-                                                textColor="{{themeStyle.btn_text_color}}"
-                                                text="{{$root.m28}}"
-                                                data-event-opts="{{[['^click',[['buyNow']]]]}}"
-                                                bind:click="__e" bind:__l="__l"></ns-goods-action-button>
-                                        </block>
-                                    </block>
-                                </block>
-                            </block>
-                        </block>
-                    </block>
-                </block>
-            </block>
-            <block wx:else>
-                <ns-goods-action-button class="goods-action-button active3 data-v-13d744e7"
-                    vue-id="{{('6db62043-21')+','+('6db62043-10')}}" disabled-text="{{$root.m29}}"
-                    disabled="{{true}}" bind:__l="__l"></ns-goods-action-button>
-            </block>
-        </ns-goods-action>
-    </goods-detail-view>
-    <block wx:if="{{showTop}}">
-        <to-top bind:toTop="__e" vue-id="6db62043-22"
-            data-event-opts="{{[['^toTop',[['scrollToTopNative']]]]}}" class="data-v-13d744e7"
-            bind:__l="__l"></to-top>
-    </block>
-    <block wx:if="{{goodsSkuDetail.isinformation==1}}">
-        <hover-nav vue-id="6db62043-23" mobile="{{false}}" class="data-v-13d744e7" bind:__l="__l"></hover-nav>
-    </block>
-    <ns-login vue-id="6db62043-24" data-ref="login" class="data-v-13d744e7 vue-ref" bind:__l="__l"></ns-login>
-    <loading-cover vue-id="6db62043-25" data-ref="loadingCover" class="data-v-13d744e7 vue-ref"
-        bind:__l="__l"></loading-cover>
-    <privacy-popup vue-id="6db62043-26" data-ref="privacyPopup" class="data-v-13d744e7 vue-ref"
-        bind:__l="__l"></privacy-popup>
-</view>
\ No newline at end of file
+<page-meta page-style="{{themeColor}}" class="data-v-13d744e7"></page-meta><view class="data-v-13d744e7"><goods-detail-view vue-id="6db62043-1" goodsSkuDetail="{{goodsSkuDetail}}" data-ref="goodsDetailView" class="data-v-13d744e7 vue-ref" bind:__l="__l" vue-slots="{{['price','skuspec','business','action']}}"><view slot="price"><block wx:if="{{showDiscount&&goodsSkuDetail.discountTimeMachine}}"><view class="goods-promotion data-v-13d744e7"><view class="price-info data-v-13d744e7"><view class="icon-box data-v-13d744e7"><text class="iconfont icon-tutechan data-v-13d744e7"></text></view><view class="price-box data-v-13d744e7"><view class="promotion-text data-v-13d744e7">限时折扣</view><block wx:if="{{goodsSkuDetail.sale_show}}"><view class="sale-num data-v-13d744e7">{{"已售"+goodsSkuDetail.sale_num+goodsSkuDetail.unit}}</view></block></view></view><view class="countdown data-v-13d744e7"><view class="txt data-v-13d744e7">距结束仅剩</view><view class="clockrun data-v-13d744e7"><uni-count-down vue-id="{{('6db62043-2')+','+('6db62043-1')}}" day="{{goodsSkuDetail.discountTimeMachine.d}}" hour="{{goodsSkuDetail.discountTimeMachine.h}}" minute="{{goodsSkuDetail.discountTimeMachine.i}}" second="{{goodsSkuDetail.discountTimeMachine.s}}" splitorColor="#ffffff" backgroundColor="#ffffff" class="data-v-13d744e7" bind:__l="__l"></uni-count-down></view></view></view></block><view class="group-wrap padding-top data-v-13d744e7"><view class="goods-module-wrap data-v-13d744e7"><block wx:if="{{goodsSkuDetail.isinformation==0}}"><block class="data-v-13d744e7"><block wx:if="{{showDiscount}}"><text class="price-symbol price-font data-v-13d744e7">{{$root.m0}}</text><text class="price price-font data-v-13d744e7">{{$root.g0[0]}}</text><text class="price-symbol price-font data-v-13d744e7">{{"."+$root.g1[1]}}</text></block><block wx:else><block wx:if="{{goodsSkuDetail.member_price>0}}"><text class="price-symbol price-font data-v-13d744e7">{{$root.m1}}</text><text class="price price-font data-v-13d744e7">{{$root.g2[0]}}</text><text class="price-symbol price-font data-v-13d744e7">{{"."+$root.g3[1]}}</text><view class="member-vip-wrap data-v-13d744e7"><image src="{{$root.g4}}" mode="aspectFit" class="data-v-13d744e7"></image></view><block wx:if="{{!goodsSkuDetail.market_price_show}}"><view class="member-price-wrap data-v-13d744e7"><text class="unit price-font data-v-13d744e7">原价</text><text class="unit price-font data-v-13d744e7">{{$root.m2}}</text><text class="money price-font data-v-13d744e7">{{goodsSkuDetail.price}}</text></view></block></block><block wx:else><text class="price-symbol price-font data-v-13d744e7">{{$root.m3}}</text><text class="price price-font data-v-13d744e7">{{$root.g5[0]}}</text><text class="price-symbol price-font data-v-13d744e7">{{"."+$root.g6[1]}}</text></block></block><block wx:if="{{goodsSkuDetail.market_price_show}}"><view class="market-price-wrap data-v-13d744e7"><block wx:if="{{showDiscount&&goodsSkuDetail.price>0||goodsSkuDetail.market_price>0}}"><text class="unit price-font data-v-13d744e7">{{''+$root.m4+''}}</text></block><block wx:if="{{showDiscount&&goodsSkuDetail.price>0}}"><text class="money price-font data-v-13d744e7">{{goodsSkuDetail.price}}</text></block><block wx:else><block wx:if="{{goodsSkuDetail.market_price>0}}"><text class="money price-font data-v-13d744e7">{{goodsSkuDetail.market_price}}</text></block></block></view></block><view class="follow-and-share data-v-13d744e7"><text data-event-opts="{{[['tap',[['openSharePopup']]]]}}" class="follow iconfont icon-share data-v-13d744e7" bindtap="__e"></text><text data-event-opts="{{[['tap',[['editCollection']]]]}}" class="{{['share','iconfont','data-v-13d744e7',whetherCollection==1?'icon-likefill color-base-text':'icon-guanzhu']}}" bindtap="__e"></text></view></block></block><block wx:else><block class="data-v-13d744e7"><text class="price price-font data-v-13d744e7" style="font-weight:600;">{{$root.m5}}</text></block></block></view><view class="goods-module-wrap info data-v-13d744e7"><text class="sku-name-wrap data-v-13d744e7">{{goodsSkuDetail.goods_name}}</text><block wx:if="{{goodsSkuDetail.introduction}}"><text class="introduction data-v-13d744e7" style="{{'color:'+(goodsSkuDetail.config?goodsSkuDetail.config.introduction_color:'')+';'}}">{{''+goodsSkuDetail.introduction+''}}</text></block><block wx:if="{{goodsSkuDetail.label_name}}"><view class="goods-tag-list data-v-13d744e7"><text class="tag-item data-v-13d744e7">{{goodsSkuDetail.label_name}}</text></view></block><view class="logistics-wrap data-v-13d744e7"><block wx:if="{{goodsSkuDetail.stock_show&&goodsSkuDetail.isinformation!=1}}"><text class="data-v-13d744e7">{{$root.m6+": "+(goodsSkuDetail.stock+goodsSkuDetail.unit)}}</text></block><block wx:if="{{goodsSkuDetail.sale_show&&goodsSkuDetail.isinformation!=1}}"><text class="data-v-13d744e7">{{$root.m7+": "+(goodsSkuDetail.sale_num+goodsSkuDetail.unit)}}</text></block></view></view></view><view class="group-wrap data-v-13d744e7"><ns-goods-promotion vue-id="{{('6db62043-3')+','+('6db62043-1')}}" promotion="discount" data-ref="goodsPromotion" class="data-v-13d744e7 vue-ref" bind:__l="__l"></ns-goods-promotion></view><block wx:if="{{goodsSkuDetail.fenxiao_detail&&goodsSkuDetail.fenxiao_detail.words_account&&goodsSkuDetail.fenxiao_detail.commission_money>0&&goodsSkuDetail.fenxiao_detail.is_commission_money==1}}"><view class="group-wrap fenxiao-detail data-v-13d744e7"><view class="title color-base-text data-v-13d744e7">{{$root.m8}}</view><view class="commission-ratio data-v-13d744e7"><view class="item data-v-13d744e7"><view class="data-v-13d744e7">{{"One "+$root.m9}}</view><view class="price-color data-v-13d744e7"><text class="unit data-v-13d744e7">￥</text><text class="money data-v-13d744e7">{{$root.g7[0]}}</text><text class="unit data-v-13d744e7">{{"."+$root.g8[1]}}</text></view></view></view></view></block></view><view data-event-opts="{{[['tap',[['buyNow']]]]}}" class="item selected-sku-spec data-v-13d744e7" bindtap="__e" slot="skuspec"><view class="label data-v-13d744e7">{{$root.m10}}</view><view class="box data-v-13d744e7"><block wx:for="{{goodsSkuDetail.sku_spec_format}}" wx:for-item="item" wx:for-index="index" wx:key="index"><text class="data-v-13d744e7">{{item.spec_name+"/"+item.spec_value_name}}</text></block></view><text class="iconfont iconright data-v-13d744e7"></text></view><view slot="business"><block wx:if="{{goodsSkuDetail.goods_id}}"><ns-goods-sku vue-id="{{('6db62043-4')+','+('6db62043-1')}}" goods-id="{{goodsSkuDetail.goods_id}}" goods-detail="{{goodsSkuDetail}}" max-buy="{{goodsSkuDetail.max_buy}}" min-buy="{{goodsSkuDetail.min_buy}}" data-ref="goodsSku" data-event-opts="{{[['^refresh',[['refreshGoodsSkuDetail']]],['^getSkuId',[['setSkuId']]]]}}" bind:refresh="__e" bind:getSkuId="__e" class="data-v-13d744e7 vue-ref" bind:__l="__l"></ns-goods-sku></block><block wx:if="{{$root.g9}}"><view class="data-v-13d744e7"><view data-event-opts="{{[['tap',[['openBundlingPopup']]]]}}" class="group-wrap data-v-13d744e7" bindtap="__e"><view data-event-opts="{{[['tap',[['openBundlingPopup']]]]}}" class="goods-cell data-v-13d744e7" bindtap="__e"><view class="box data-v-13d744e7"><text class="tit data-v-13d744e7">组合套餐</text><text class="data-v-13d744e7">{{bundling[0].bl_name}}</text></view><text class="iconfont icon-right data-v-13d744e7"></text></view><scroll-view class="combo-goods-wrap color-tip data-v-13d744e7" scroll-x="true"><view class="goods-wrap data-v-13d744e7"><block wx:if="{{bundlingType==true}}"><view data-event-opts="{{[['tap',[['toGoodsDetail',['$0'],['skuId']]]]]}}" class="goods-item data-v-13d744e7" bindtap="__e"><view class="combo-img data-v-13d744e7"><image src="{{$root.g10}}" data-event-opts="{{[['error',[['imageError']]]]}}" binderror="__e" class="data-v-13d744e7"></image><view class="price-wrap data-v-13d744e7"><text class="unit price-font data-v-13d744e7">{{$root.m11}}</text><text class="price price-font data-v-13d744e7">{{goodsSkuDetail.price}}</text></view></view><text class="name data-v-13d744e7">{{goodsSkuDetail.goods_name}}</text></view></block><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block class="data-v-13d744e7"><block wx:if="{{index<3}}"><view data-event-opts="{{[['tap',[['toGoodsDetail',['$0'],[[['bundling.__$n0.bundling_goods','',index,'sku_id']]]]]]]}}" class="goods-item data-v-13d744e7" bindtap="__e"><view class="combo-img data-v-13d744e7"><image src="{{item.g11}}" data-event-opts="{{[['error',[['bundlingImageError',[0,index]]]]]}}" binderror="__e" class="data-v-13d744e7"></image><view class="price-wrap data-v-13d744e7"><text class="unit price-font data-v-13d744e7">{{item.m12}}</text><text class="price price-font data-v-13d744e7">{{item.$orig.price}}</text></view></view><text class="name data-v-13d744e7">{{item.$orig.sku_name}}</text></view></block></block></block></view></scroll-view></view><view data-event-opts="{{[['touchmove',[['',['$event']]]]]}}" catchtouchmove="__e" class="data-v-13d744e7"><uni-popup vue-id="{{('6db62043-5')+','+('6db62043-1')}}" type="bottom" data-ref="bundlingPopup" class="data-v-13d744e7 vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><view class="bundling-popup-layer popup-layer data-v-13d744e7"><view data-event-opts="{{[['tap',[['closeBundlingPopup']]]]}}" class="head-wrap data-v-13d744e7" bindtap="__e"><text class="data-v-13d744e7">组合套餐</text><text class="iconfont icon-close data-v-13d744e7"></text></view><scroll-view class="bundling-body data-v-13d744e7" scroll-y="{{true}}"><view class="bundling-view data-v-13d744e7"><block wx:for="{{$root.l2}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block class="data-v-13d744e7"><view class="bundling-item data-v-13d744e7"><view data-event-opts="{{[['tap',[['toComoDetail',['$0'],[[['bundling','',index,'bl_id']]]]]]]}}" class="title data-v-13d744e7" bindtap="__e"><text class="data-v-13d744e7">{{item.$orig.bl_name}}</text><text class="iconfont icon-right data-v-13d744e7"></text></view><scroll-view scroll-x="{{true}}" class="data-v-13d744e7"><view class="goods-wrap data-v-13d744e7"><view data-event-opts="{{[['tap',[['toGoodsDetail',['$0'],['skuId']]]]]}}" class="goods-item data-v-13d744e7" bindtap="__e"><view class="combo-img data-v-13d744e7"><image src="{{item.g12}}" data-event-opts="{{[['error',[['imageError']]]]}}" binderror="__e" class="data-v-13d744e7"></image><view class="price-wrap data-v-13d744e7"><text class="unit price-font data-v-13d744e7">{{item.m13}}</text><text class="price price-font data-v-13d744e7">{{goodsSkuDetail.price}}</text></view></view><text class="name data-v-13d744e7">{{goodsSkuDetail.goods_name}}</text></view><block wx:for="{{item.l1}}" wx:for-item="goods" wx:for-index="goods_index" wx:key="goods_index"><block class="data-v-13d744e7"><block wx:if="{{goods_index<3}}"><view data-event-opts="{{[['tap',[['toGoodsDetail',['$0'],[[['bundling','',index],['bundling_goods','',goods_index,'sku_id']]]]]]]}}" class="goods-item data-v-13d744e7" bindtap="__e"><view class="combo-img data-v-13d744e7"><image src="{{goods.g13}}" data-event-opts="{{[['error',[['bundlingImageError',[index,goods_index]]]]]}}" binderror="__e" class="data-v-13d744e7"></image><view class="price-wrap data-v-13d744e7"><text class="unit price-font data-v-13d744e7">{{goods.m14}}</text><text class="price price-font data-v-13d744e7">{{goods.$orig.price}}</text></view></view><text class="name data-v-13d744e7">{{goods.$orig.sku_name}}</text></view></block></block></block></view></scroll-view><view class="bundling-price-wrap data-v-13d744e7"><text class="label data-v-13d744e7">套餐价</text><text class="unit price-color data-v-13d744e7">{{item.m15}}</text><text class="price price-color data-v-13d744e7">{{item.$orig.bl_price}}</text><button class="mini data-v-13d744e7" type="primary" size="mini" data-event-opts="{{[['tap',[['toComoDetail',['$0'],[[['bundling','',index,'bl_id']]]]]]]}}" bindtap="__e">立即购买</button></view></view></block></block></view></scroll-view></view></uni-popup></view></view></block><view data-event-opts="{{[['touchmove',[['',['$event']]]]]}}" catchtouchmove="__e" class="data-v-13d744e7"><uni-popup vue-id="{{('6db62043-6')+','+('6db62043-1')}}" type="bottom" data-ref="couponPopup" class="data-v-13d744e7 vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><view class="goods-coupon-popup-layer popup-layer data-v-13d744e7"><view data-event-opts="{{[['tap',[['closeCouponPopup']]]]}}" class="head-wrap data-v-13d744e7" bindtap="__e"><text class="data-v-13d744e7">优惠券</text><text class="iconfont icon-close data-v-13d744e7"></text></view><scroll-view class="coupon-body data-v-13d744e7" scroll-y="{{true}}"><block wx:for="{{$root.l3}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block wx:if="{{hackReset}}"><view class="coupon-item ns-gradient-diy-goods-list data-v-13d744e7"><view class="coupon-info data-v-13d744e7" style="{{'background-color:'+(item.$orig.useState==2?'#F2F2F2':'var(--main-color-shallow)')+';'}}"><view class="{{['info-wrap','data-v-13d744e7',(item.$orig.useState==2)?'disabled':'']}}"><image class="coupon-line data-v-13d744e7" mode="heightFix" src="{{$root.g14}}"></image><view class="coupon-money data-v-13d744e7"><block wx:if="{{item.$orig.type=='reward'}}"><text class="unit data-v-13d744e7">{{item.m16}}</text><text class="money data-v-13d744e7">{{item.m17}}</text></block><block wx:else><block wx:if="{{item.$orig.type=='discount'}}"><text class="money data-v-13d744e7">{{item.m18}}</text><text class="unit data-v-13d744e7">折</text></block></block><view class="at-least data-v-13d744e7"><block wx:if="{{item.$orig.at_least>0}}">{{'满'+item.$orig.at_least+'可用'}}</block><block wx:else>无门槛</block></view></view></view><view class="desc-wrap data-v-13d744e7"><view class="coupon-name data-v-13d744e7">{{item.$orig.coupon_name}}</view><block wx:if="{{item.$orig.type=='discount'&&item.$orig.discount_limit>0}}"><view class="limit data-v-13d744e7">{{"最多可抵￥"+item.$orig.discount_limit}}</view></block><block wx:if="{{item.$orig.validity_type==0}}"><view class="time font-size-goods-tag data-v-13d744e7">{{"有效期："+item.g15}}</view></block><block wx:else><block wx:if="{{item.$orig.validity_type==1}}"><view class="time font-size-goods-tag data-v-13d744e7">{{"有效期：领取之日起"+item.$orig.fixed_term+"天内有效"}}</view></block><block wx:else><view class="time font-size-goods-tag data-v-13d744e7">有效期：长期有效</view></block></block></view><block wx:if="{{item.$orig.useState==2}}"><button type="primary" disabled="{{true}}" class="data-v-13d744e7">已抢光</button></block><block wx:else><block wx:if="{{item.$orig.useState==1}}"><button type="primary" disabled="{{true}}" class="data-v-13d744e7">已领取</button></block><block wx:else><button type="primary" data-event-opts="{{[['tap',[['receiveCoupon',['$0'],[[['couponList','',index]]]]]]]}}" bindtap="__e" class="data-v-13d744e7">领取</button></block></block></view></view></block></block></scroll-view><view class="button-box data-v-13d744e7"><button type="primary" data-event-opts="{{[['tap',[['closeCouponPopup']]]]}}" bindtap="__e" class="data-v-13d744e7">确定</button></view></view></uni-popup></view><block wx:if="{{addonIsExist.manjian}}"><view data-event-opts="{{[['touchmove',[['',['$event']]]]]}}" catchtouchmove="__e" class="data-v-13d744e7"><uni-popup vue-id="{{('6db62043-7')+','+('6db62043-1')}}" type="bottom" data-ref="manjianPopup" class="data-v-13d744e7 vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><view class="manjian-popup-layer popup-layer data-v-13d744e7"><view data-event-opts="{{[['tap',[['closeManjianPopup']]]]}}" class="head-wrap data-v-13d744e7" bindtap="__e"><text class="data-v-13d744e7">促销</text><text class="iconfont icon-close data-v-13d744e7"></text></view><scroll-view class="manjian-body data-v-13d744e7" scroll-y="{{true}}"><block wx:if="{{manjian.manjian!=undefined}}"><view class="item data-v-13d744e7" style="display:flex;"><view class="free-tip color-base-text color-base-border data-v-13d744e7">满减</view><text class="font-size-base data-v-13d744e7">{{manjian.manjian}}</text></view></block><block wx:if="{{manjian.mansong!=undefined}}"><view class="item data-v-13d744e7"><text class="free-tip color-base-text color-base-border data-v-13d744e7">满送</text><text class="font-size-base data-v-13d744e7">{{manjian.mansong}}</text></view></block><block wx:if="{{manjian.free_shipping!=undefined}}"><view class="item data-v-13d744e7" style="display:flex;"><view class="free-tip color-base-text color-base-border data-v-13d744e7">包邮</view><text class="font-size-base data-v-13d744e7">{{manjian.free_shipping}}</text></view></block></scroll-view><view class="button-box data-v-13d744e7"><button type="primary" data-event-opts="{{[['tap',[['closeManjianPopup']]]]}}" bindtap="__e" class="data-v-13d744e7">确定</button></view></view></uni-popup></view></block><view data-event-opts="{{[['touchmove',[['',['$event']]]]]}}" class="goods-sku data-v-13d744e7" catchtouchmove="__e"><uni-popup vue-id="{{('6db62043-8')+','+('6db62043-1')}}" type="bottom" data-ref="informationPopup" class="data-v-13d744e7 vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><view class="manjian-popup-layer popup-layer data-v-13d744e7" style="{{'height:'+(FormHeight)+';'}}"><view data-event-opts="{{[['tap',[['closeinformationPopup']]]]}}" class="head-wrap data-v-13d744e7" bindtap="__e"><text class="data-v-13d744e7">商品留言</text><text class="iconfont icon-close data-v-13d744e7"></text></view><scroll-view class="manjian-body data-v-13d744e7" scroll-y="{{true}}"><view style="padding:0 30rpx;" class="data-v-13d744e7"><ns-form vue-id="{{('6db62043-9')+','+('6db62043-8')}}" data="{{informationform}}" data-ref="form" class="data-v-13d744e7 vue-ref" bind:__l="__l"></ns-form></view></scroll-view><view class="button-box data-v-13d744e7"><button type="primary" data-event-opts="{{[['tap',[['saveubfirnation']]]]}}" bindtap="__e" class="data-v-13d744e7">确定</button></view></view></uni-popup></view></view><ns-goods-action vue-id="{{('6db62043-10')+','+('6db62043-1')}}" safeArea="{{isIphoneX}}" class="data-v-13d744e7" slot="action" bind:__l="__l" vue-slots="{{['default']}}"><block wx:if="{{goodsSkuDetail.goods_state==1}}"><block wx:if="{{goodsSkuDetail.store_goods_status!=undefined&&goodsSkuDetail.store_goods_status!=1}}"><ns-goods-action-button class="goods-action-button active3 data-v-13d744e7" vue-id="{{('6db62043-11')+','+('6db62043-10')}}" disabled-text="{{$root.m19}}" disabled="{{true}}" bind:__l="__l"></ns-goods-action-button></block><block wx:else><block class="data-v-13d744e7"><block wx:if="{{goodsSkuDetail.isinformation!=1}}"><ns-goods-action-icon vue-id="{{('6db62043-12')+','+('6db62043-10')}}" text="{{$root.m20}}" icon="icon-shouye1" data-event-opts="{{[['^click',[['goHome']]]]}}" bind:click="__e" class="data-v-13d744e7" bind:__l="__l"></ns-goods-action-icon></block><ns-goods-action-icon vue-id="{{('6db62043-13')+','+('6db62043-10')}}" text="{{$root.m21}}" cornerMarkBg="{{themeStyle.goods_detail.goods_cart_num_corner}}" icon="icon-gouwuche2" corner-mark="{{cartNumber>0?cartNumber+'':''}}" data-event-opts="{{[['^click',[['goCart']]]]}}" bind:click="__e" class="data-v-13d744e7" bind:__l="__l"></ns-goods-action-icon><block wx:if="{{goodsSkuDetail.isinformation!=1}}"><ns-goods-action-icon vue-id="{{('6db62043-14')+','+('6db62043-10')}}" text="{{$root.m22}}" icon="icox icox-kefu" send-data="{{contactData}}" chatParam="{{chatRoomParams}}" class="data-v-13d744e7" bind:__l="__l"></ns-goods-action-icon></block><block wx:if="{{goodsSkuDetail.isinformation>=1}}"><block class="data-v-13d744e7"><block wx:if="{{goodsSkuDetail.isinformation==1}}"><ns-goods-action-button class="goods-action-button active3 data-v-13d744e7" vue-id="{{('6db62043-15')+','+('6db62043-10')}}" disabled-text backgroundColor="#54c952" text="{{$root.m23}}" disabled="{{false}}" data-event-opts="{{[['^click',[['phoneClick',['$0'],['goodsSkuDetail.goods_mobile']]]]]}}" bind:click="__e" bind:__l="__l"></ns-goods-action-button></block><block wx:if="{{goodsSkuDetail.isinformation==2}}"><ns-goods-action-button class="goods-action-button active3 data-v-13d744e7" vue-id="{{('6db62043-16')+','+('6db62043-10')}}" disabled-text backgroundColor="#54c952" text="{{$root.m24}}" disabled="{{false}}" data-event-opts="{{[['^click',[['showinformation']]]]}}" bind:click="__e" bind:__l="__l"></ns-goods-action-button></block></block></block><block wx:else><block class="data-v-13d744e7"><block wx:if="{{goodsSkuDetail.stock==0&&!goodsSkuDetail.sku_spec_format}}"><block class="data-v-13d744e7"><ns-goods-action-button class="goods-action-button active3 data-v-13d744e7" vue-id="{{('6db62043-17')+','+('6db62043-10')}}" disabled-text="{{$root.m25}}" disabled="{{true}}" bind:__l="__l"></ns-goods-action-button></block></block><block wx:else><block wx:if="{{goodsSkuDetail.is_limit==1&&goodsSkuDetail.limit_type==2&&goodsSkuDetail.max_buy!=0&&goodsSkuDetail.purchased_num>=goodsSkuDetail.max_buy}}"><block class="data-v-13d744e7"><ns-goods-action-button class="goods-action-button active3 data-v-13d744e7" vue-id="{{('6db62043-18')+','+('6db62043-10')}}" disabled-text="{{$root.m26}}" disabled="{{true}}" bind:__l="__l"></ns-goods-action-button></block></block><block wx:else><block class="data-v-13d744e7"><block wx:if="{{goodsSkuDetail.is_virtual==0}}"><ns-goods-action-button class="goods-action-button data-v-13d744e7" vue-id="{{('6db62043-19')+','+('6db62043-10')}}" text="{{$root.m27}}" backgroundColor="{{themeStyle.goods_detail.goods_btn_color_shallow}}" data-event-opts="{{[['^click',[['joinCart']]]]}}" bind:click="__e" bind:__l="__l"></ns-goods-action-button></block><ns-goods-action-button class="goods-action-button data-v-13d744e7" vue-id="{{('6db62043-20')+','+('6db62043-10')}}" backgroundColor="{{themeStyle.goods_detail.goods_btn_color}}" textColor="{{themeStyle.btn_text_color}}" text="{{$root.m28}}" data-event-opts="{{[['^click',[['buyNow']]]]}}" bind:click="__e" bind:__l="__l"></ns-goods-action-button></block></block></block></block></block></block></block></block><block wx:else><ns-goods-action-button class="goods-action-button active3 data-v-13d744e7" vue-id="{{('6db62043-21')+','+('6db62043-10')}}" disabled-text="{{$root.m29}}" disabled="{{true}}" bind:__l="__l"></ns-goods-action-button></block></ns-goods-action></goods-detail-view><block wx:if="{{showTop}}"><to-top bind:toTop="__e" vue-id="6db62043-22" data-event-opts="{{[['^toTop',[['scrollToTopNative']]]]}}" class="data-v-13d744e7" bind:__l="__l"></to-top></block><block wx:if="{{goodsSkuDetail.isinformation==1}}"><hover-nav vue-id="6db62043-23" mobile="{{false}}" class="data-v-13d744e7" bind:__l="__l"></hover-nav></block><ns-login vue-id="6db62043-24" data-ref="login" class="data-v-13d744e7 vue-ref" bind:__l="__l"></ns-login><loading-cover vue-id="6db62043-25" data-ref="loadingCover" class="data-v-13d744e7 vue-ref" bind:__l="__l"></loading-cover><privacy-popup vue-id="6db62043-26" data-ref="privacyPopup" class="data-v-13d744e7 vue-ref" bind:__l="__l"></privacy-popup></view>
\ No newline at end of file
diff --git a/pages/order/detail.wxml b/pages/order/detail.wxml
index 7eed518..82c4384 100644
--- a/pages/order/detail.wxml
+++ b/pages/order/detail.wxml
@@ -1 +1 @@
-<page-meta page-style="{{themeColor}}" class="data-v-086933ca"></page-meta><view class="{{['detail-container','data-v-086933ca',(isIphoneX)?'safe-area':'']}}"><view class="status-wrap color-base-bg data-v-086933ca" style="{{'background-image:'+('url('+$root.g0+')')+';'}}"><view class="order-status-left data-v-086933ca"><image src="{{$root.g1}}" class="data-v-086933ca"></image><view class="status-name data-v-086933ca"><view class="name data-v-086933ca">{{''+orderData.order_status_name+''}}<block wx:if="{{orderData.promotion_status_name}}"><text class="data-v-086933ca">{{"（"+orderData.promotion_status_name+"）"}}</text></block></view><block wx:if="{{orderData.promotion_type=='presale'&&orderData.order_status==1}}"><view class="desc data-v-086933ca">{{'预计'+$root.g2+'日后发货'}}</view></block><block wx:if="{{orderData.close_cause}}"><view class="desc data-v-086933ca">{{"订单关闭原因："+orderData.close_cause}}</view></block></view></view><block wx:if="{{orderData.order_status==0}}"><view class="order-time data-v-086933ca" id="action-date">剩余时间：<uni-count-down vue-id="a2b0478a-1" day="{{orderData.closeTimeMachine.d}}" hour="{{orderData.closeTimeMachine.h}}" minute="{{orderData.closeTimeMachine.i}}" second="{{orderData.closeTimeMachine.s}}" color="#fff" splitorColor="#fff" class="data-v-086933ca" bind:__l="__l"></uni-count-down></view></block></view><block wx:if="{{orderData.order_type==1||orderData.order_type==3}}"><view class="address-wrap data-v-086933ca"><view class="icon data-v-086933ca"><view class="iconfont icon-location data-v-086933ca"></view></view><view class="address-info data-v-086933ca"><view class="info data-v-086933ca"><text class="font-size-base data-v-086933ca">{{orderData.name+" "+orderData.mobile}}</text></view><view class="detail data-v-086933ca"><text class="font-size-base data-v-086933ca">{{"收货地址："+orderData.full_address+" "+orderData.address}}</text></view></view><block wx:if="{{orderData.order_type==3}}"><view class="pick-block first-pick-block data-v-086933ca"><view class="font-size-base data-v-086933ca">送达时间：</view><view class="last-child data-v-086933ca">{{orderData.buyer_ask_delivery_time}}</view></view><block wx:if="{{orderData.package_list}}"><block class="data-v-086933ca"><view class="pick-block data-v-086933ca"><view class="data-v-086933ca">配送员：</view><view class="last-child data-v-086933ca">{{orderData.package_list.deliverer}}</view></view><view class="pick-block data-v-086933ca"><view class="data-v-086933ca">外卖电话：</view><view class="last-child data-v-086933ca">{{orderData.package_list.deliverer_mobile}}</view></view></block></block></block></view></block><block wx:if="{{orderData.order_type==2}}"><view class="store-wrap data-v-086933ca"><view class="data-v-086933ca"><block wx:if="{{orderData.delivery_store_info}}"><view class="store-info data-v-086933ca"><view class="icon data-v-086933ca"><view class="iconfont icon-mendian data-v-086933ca"></view></view><view class="store-info-detail data-v-086933ca"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="store-name data-v-086933ca" bindtap="__e"><text class="name font-size-base data-v-086933ca">{{orderData.delivery_store_name}}</text><text class="iconfont icon-right font-size-base data-v-086933ca"></text></view><view class="detail store-detail data-v-086933ca"><block wx:if="{{orderData.delivery_store_info.open_date}}"><view class="color-tip data-v-086933ca">{{'营业时间：'+orderData.delivery_store_info.open_date}}</view></block><view class="color-tip data-v-086933ca">{{"地址："+orderData.delivery_store_info.full_address}}</view></view></view></view></block><block wx:else><view class="data-v-086933ca"><view class="address-empty data-v-086933ca"><view class="color-base-text data-v-086933ca">当前无自提门店</view></view></view></block></view><view class="pick-block first-pick-block data-v-086933ca"><view class="font-size-base data-v-086933ca">姓名</view><input class="last-child data-v-086933ca" type="text" disabled="{{true}}" value="{{orderData.name}}"/></view><view class="pick-block first-pick-block data-v-086933ca"><view class="font-size-base data-v-086933ca">预留手机</view><input class="last-child data-v-086933ca" type="number" disabled="{{true}}" value="{{orderData.mobile}}"/></view><view class="pick-block first-pick-block data-v-086933ca"><view class="font-size-base data-v-086933ca">提货时间</view><input class="last-child data-v-086933ca" disabled="{{true}}" value="{{orderData.buyer_ask_delivery_time}}"/></view></view><block wx:if="{{orderData.pay_status}}"><view class="pickup-info data-v-086933ca"><view class="pickup-code-info data-v-086933ca"><view class="info data-v-086933ca"><text class="font-size-base data-v-086933ca"><text class="color-tip font-size-base data-v-086933ca">提货码：</text>{{''+orderData.delivery_code+''}}</text><text data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="copy data-v-086933ca" bindtap="__e">复制</text></view><view class="code data-v-086933ca"><image class="barcode data-v-086933ca" src="{{$root.g3}}" mode="widthFix" data-event-opts="{{[['tap',[['e2',['$event']]]]]}}" bindtap="__e"></image><image class="qrcode data-v-086933ca" src="{{$root.g4}}" mode="widthFix" data-event-opts="{{[['tap',[['e3',['$event']]]]]}}" bindtap="__e"></image></view></view></view></block></block><view class="site-wrap data-v-086933ca" style="{{(orderData.order_type==4?'margin-top: -69rpx;':'')}}"><view class="site-body data-v-086933ca"><block wx:for="{{$root.l3}}" wx:for-item="goodsItem" wx:for-index="goodsIndex" wx:key="goodsIndex"><view class="goods-item data-v-086933ca"><view class="goods-wrap data-v-086933ca"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['orderData.order_goods','',goodsIndex]]]]]]]}}" class="goods-img data-v-086933ca" bindtap="__e"><image src="{{goodsItem.g5}}" mode="aspectFill" data-event-opts="{{[['error',[['imageError',[goodsIndex]]]]]}}" binderror="__e" class="data-v-086933ca"></image></view><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['orderData.order_goods','',goodsIndex]]]]]]]}}" class="goods-info data-v-086933ca" bindtap="__e"><view class="goods-name data-v-086933ca">{{goodsItem.$orig.sku_name}}</view><block wx:if="{{goodsItem.$orig.sku_spec_format}}"><view class="sku data-v-086933ca"><view class="goods-spec data-v-086933ca"><block wx:for="{{goodsItem.l0}}" wx:for-item="x" wx:for-index="i" wx:key="i"><block class="data-v-086933ca">{{''+x.$orig.spec_value_name+"\n\t\t\t\t\t\t\t\t\t"+(i<x.g6-1?'; ':'')+''}}</block></block></view></view></block><view class="goods-sub-section data-v-086933ca"><view class="data-v-086933ca"><text class="goods-price data-v-086933ca"><text class="unit price-style small data-v-086933ca">{{$root.m0}}</text><text class="price-style large data-v-086933ca">{{goodsItem.g7[0]}}</text><text class="unit price-style small data-v-086933ca">{{"."+goodsItem.g8[1]}}</text></text></view><view class="data-v-086933ca"><text class="font-size-base data-v-086933ca"><text class="iconfont icon-close data-v-086933ca"></text>{{''+goodsItem.$orig.num+''}}</text></view></view><block wx:if="{{goodsItem.$orig.card_item_id}}"><view class="goods-card data-v-086933ca">次卡抵扣<text class="goods-price data-v-086933ca"><text class="unit price-style small data-v-086933ca">{{"-"+goodsItem.m1}}</text><text class="price-style large data-v-086933ca">{{goodsItem.g9[0]}}</text><text class="unit price-style small data-v-086933ca">{{"."+goodsItem.g10[1]}}</text></text></view></block></view></view><block wx:if="{{goodsItem.$orig.form}}"><view class="goods-form data-v-086933ca"><block wx:for="{{goodsItem.l2}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">{{item.$orig.value.title+"："}}</text><block wx:if="{{item.$orig.controller=='Img'}}"><view class="box img-box data-v-086933ca"><block wx:for="{{item.l1}}" wx:for-item="img" wx:for-index="imgIndex" wx:key="imgIndex"><view class="img data-v-086933ca"><image src="{{img.g11}}" mode="widthFix" data-event-opts="{{[['tap',[['e4',['$event']]]]]}}" data-event-params="{{({img:img.$orig})}}" bindtap="__e" class="data-v-086933ca"></image></view></block></view></block><block wx:else><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{item.$orig.val}}</text><text data-event-opts="{{[['tap',[['e5',['$event']]]]]}}" data-event-params="{{({item:item.$orig})}}" class="copy data-v-086933ca" bindtap="__e">复制</text></view></block></view></block></view></block><view class="goods-action data-v-086933ca"><block wx:if="{{orderData.is_enable_refund}}"><block class="data-v-086933ca"><block wx:if="{{orderData.order_scene=='online'&&(goodsItem.$orig.refund_status==0||goodsItem.$orig.refund_status==-1)}}"><view data-event-opts="{{[['tap',[['goRefund',['$0'],[[['orderData.order_goods','',goodsIndex,'order_goods_id']]]]]]]}}" bindtap="__e" class="data-v-086933ca"><block wx:if="{{orderData.promotion_type!='blindbox'}}"><view class="order-box-btn data-v-086933ca">{{''+(orderData.order_status==10?'申请售后':'申请退款')+''}}</view></block></view></block></block></block><block wx:if="{{goodsItem.$orig.refund_status!=0&&goodsItem.$orig.refund_status!=-1}}"><view data-event-opts="{{[['tap',[['goRefundDetail',['$0'],[[['orderData.order_goods','',goodsIndex,'order_goods_id']]]]]]]}}" bindtap="__e" class="data-v-086933ca"><view class="order-box-btn data-v-086933ca">{{orderData.order_status==10?'查看售后':'查看退款'}}</view></view></block></view></view></block></view></view><view class="order-summary data-v-086933ca"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">订单类型：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.order_type_name}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">订单编号：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.order_no}}</text><view data-event-opts="{{[['tap',[['e6',['$event']]]]]}}" class="copy data-v-086933ca" bindtap="__e">复制</view></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">订单交易号：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.out_trade_no}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">创建时间：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{$root.g12}}</text></view></view><block wx:if="{{orderData.close_time>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">关闭时间：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{$root.g13}}</text></view></view></block><block wx:if="{{orderData.pay_status>0}}"><block class="data-v-086933ca"><view class="hr data-v-086933ca"></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">支付方式：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.pay_type_name}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">支付时间：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{$root.g14}}</text></view></view></block></block><block wx:if="{{orderData.delivery_type_name}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">配送方式：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.delivery_type_name}}</text></view></view></block><block wx:if="{{orderData.buyer_message!=''}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">买家留言：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.buyer_message}}</text></view></view></block><block wx:if="{{orderData.promotion_type_name!=''}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">活动优惠：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.promotion_type_name}}</text></view></view></block><block wx:if="{{orderData.is_invoice>0}}"><block class="data-v-086933ca"><view class="hr data-v-086933ca"></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">发票类型：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.invoice_type==1?'纸质发票':'电子发票'}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">发票抬头类型：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.invoice_title_type==1?'个人':'企业'}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">发票抬头：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.invoice_title}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">发票内容：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.invoice_content}}</text></view></view><block wx:if="{{orderData.invoice_type==1}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">发票邮寄地址：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.invoice_full_address}}</text></view></view></block><block wx:else><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">发票接收邮件：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.invoice_email}}</text></view></view></block></block></block><block wx:if="{{orderData.form}}"><block class="data-v-086933ca"><view class="hr data-v-086933ca"></view><block wx:for="{{$root.l5}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="order-cell order-form data-v-086933ca"><text class="tit data-v-086933ca">{{item.$orig.value.title+"："}}</text><block wx:if="{{item.$orig.controller=='Img'}}"><view class="box img-box data-v-086933ca"><block wx:for="{{item.l4}}" wx:for-item="img" wx:for-index="imgIndex" wx:key="imgIndex"><view class="img data-v-086933ca"><image src="{{img.g15}}" mode="widthFix" data-event-opts="{{[['tap',[['e7',['$event']]]]]}}" data-event-params="{{({img:img.$orig})}}" bindtap="__e" class="data-v-086933ca"></image></view></block></view></block><block wx:else><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{item.$orig.val}}</text><text data-event-opts="{{[['tap',[['e8',['$event']]]]]}}" data-event-params="{{({item:item.$orig})}}" class="copy data-v-086933ca" bindtap="__e">复制</text></view></block></view></block></block></block><block wx:if="{{orderData.goods_class==5}}"><block class="data-v-086933ca"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">我的卡包：</text><view class="box data-v-086933ca"><text data-event-opts="{{[['tap',[['e9',['$event']]]]]}}" class="color-base-text data-v-086933ca" bindtap="__e">查看</text></view></view></block></block></view><block wx:if="{{orderData.virtual_goods&&orderData.goods_class==2&&orderData.virtual_goods.is_veirfy==0}}"><block class="data-v-086933ca"><view class="verify-code-wrap data-v-086933ca"><view class="code data-v-086933ca"><image class="barcode data-v-086933ca" src="{{$root.g16}}" mode="widthFix"></image><image class="qrcode data-v-086933ca" src="{{$root.g17}}" mode="widthFix"></image><text class="data-v-086933ca">请将条形码或二维码出示给核销员</text></view><view class="hr data-v-086933ca"></view><view class="wrap data-v-086933ca"><text class="font-size-base virtual-code data-v-086933ca">{{orderData.virtual_code}}</text><view data-event-opts="{{[['tap',[['e10',['$event']]]]]}}" class="copy data-v-086933ca" bindtap="__e">复制</view></view></view><view class="verify-info-wrap data-v-086933ca"><view class="head data-v-086933ca">核销信息</view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">核销次数</text><view class="box align-right data-v-086933ca"><text class="color-title data-v-086933ca">{{'剩余'+(orderData.virtual_goods.verify_total_count-orderData.virtual_goods.verify_use_num)+"次/共"+orderData.virtual_goods.verify_total_count+'次'}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">有效期</text><view class="box align-right data-v-086933ca"><block wx:if="{{orderData.virtual_goods.expire_time>0}}"><text class="color-title data-v-086933ca">{{$root.g18}}</text></block><block wx:else><text class="data-v-086933ca">永久有效</text></block></view></view></view><view class="verify-info-wrap data-v-086933ca"><view class="head data-v-086933ca">核销记录</view><block wx:if="{{$root.g19}}"><view class="data-v-086933ca"><block wx:for="{{$root.l6}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="record-item data-v-086933ca"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">核销人</text><view class="box align-right data-v-086933ca"><text class="color-title data-v-086933ca">{{item.$orig.verifier_name}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">核销时间</text><view class="box align-right data-v-086933ca"><text class="color-title data-v-086933ca">{{item.g20}}</text></view></view></view></block></view></block><block wx:else><view class="record-empty data-v-086933ca">暂无核销记录</view></block></view></block></block><block wx:if="{{orderData.virtual_goods&&orderData.goods_class==3}}"><block class="data-v-086933ca"><view class="verify-info-wrap carmichael data-v-086933ca"><view class="head data-v-086933ca">卡密信息</view><block wx:for="{{orderData.virtual_goods}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="record-item data-v-086933ca"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">卡号：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{item.card_info.cardno}}</text><view data-event-opts="{{[['tap',[['e11',['$event']]]]]}}" data-event-params="{{({item})}}" class="copy data-v-086933ca" bindtap="__e">复制</view></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">密码：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{item.card_info.password}}</text><view data-event-opts="{{[['tap',[['e12',['$event']]]]]}}" data-event-params="{{({item})}}" class="copy data-v-086933ca" bindtap="__e">复制</view></view></view></view></block></view></block></block><block wx:if="{{orderData.virtual_goods&&orderData.goods_class==4}}"><block class="data-v-086933ca"><block wx:if="{{orderData.virtual_goods.is_veirfy==0}}"><view class="verify-code-wrap data-v-086933ca"><view class="code data-v-086933ca"><image class="barcode data-v-086933ca" src="{{$root.g21}}" mode="widthFix"></image><image class="qrcode data-v-086933ca" src="{{$root.g22}}" mode="widthFix"></image><text class="data-v-086933ca">请将条形码或二维码出示给核销员</text></view><view class="hr data-v-086933ca"></view><view class="wrap data-v-086933ca"><text class="font-size-base virtual-code data-v-086933ca">{{orderData.virtual_code}}</text><view data-event-opts="{{[['tap',[['e13',['$event']]]]]}}" class="copy data-v-086933ca" bindtap="__e">复制</view></view></view></block><view class="verify-info-wrap data-v-086933ca"><view class="head data-v-086933ca">核销信息</view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">核销次数</text><view class="box align-right data-v-086933ca"><text class="color-title data-v-086933ca">{{'剩余'+(orderData.virtual_goods.verify_total_count-orderData.virtual_goods.verify_use_num)+"次/共"+orderData.virtual_goods.verify_total_count+'次'}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">有效期</text><view class="box align-right data-v-086933ca"><block wx:if="{{orderData.virtual_goods.expire_time>0}}"><text class="color-title data-v-086933ca">{{$root.g23}}</text></block><block wx:else><text class="data-v-086933ca">永久有效</text></block></view></view></view><view class="verify-info-wrap data-v-086933ca"><view class="head data-v-086933ca">核销记录</view><block wx:if="{{$root.g24}}"><view class="data-v-086933ca"><block wx:for="{{$root.l7}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="record-item data-v-086933ca"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">核销人</text><view class="box align-right data-v-086933ca"><text class="color-title data-v-086933ca">{{item.$orig.verifier_name}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">核销时间</text><view class="box align-right data-v-086933ca"><text class="color-title data-v-086933ca">{{item.g25}}</text></view></view></view></block></view></block><block wx:else><view class="record-empty data-v-086933ca">暂无核销记录</view></block></view></block></block><view class="order-money data-v-086933ca"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">商品金额</text><view class="box align-right data-v-086933ca"><text class="color-title price-font data-v-086933ca"><text class="font-size-goods-tag data-v-086933ca">{{$root.m2}}</text>{{''+orderData.goods_money+''}}</text></view></view><block wx:if="{{orderData.order_type!=4}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">运费</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="font-size-goods-tag data-v-086933ca">{{$root.m3}}</text><text class="data-v-086933ca">{{orderData.delivery_money}}</text></text></view></view></block><block wx:if="{{orderData.member_card_money>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">会员卡</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="font-size-goods-tag data-v-086933ca">{{$root.m4}}</text><text class="data-v-086933ca">{{orderData.member_card_money}}</text></text></view></view></block><block wx:if="{{orderData.invoice_money>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">税费<text class="color-base-text data-v-086933ca">{{"("+orderData.invoice_rate+"%)"}}</text></text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="operator data-v-086933ca">+</text><text class="font-size-goods-tag data-v-086933ca">{{$root.m5}}</text><text class="data-v-086933ca">{{orderData.invoice_money}}</text></text></view></view></block><block wx:if="{{orderData.invoice_delivery_money>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">发票邮寄费</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="operator data-v-086933ca">+</text><text class="font-size-goods-tag data-v-086933ca">{{$root.m6}}</text><text class="data-v-086933ca">{{orderData.invoice_delivery_money}}</text></text></view></view></block><block wx:if="{{orderData.adjust_money!=0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">订单调整</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><block wx:if="{{orderData.adjust_money<0}}"><text class="operator data-v-086933ca">-</text></block><block wx:else><text class="operator data-v-086933ca">+</text></block><text class="font-size-goods-tag data-v-086933ca">{{$root.m7}}</text><text class="data-v-086933ca">{{$root.f0}}</text></text></view></view></block><block wx:if="{{orderData.promotion_money>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">优惠</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="operator data-v-086933ca">-</text><text class="font-size-goods-tag data-v-086933ca">{{$root.m8}}</text><text class="data-v-086933ca">{{orderData.promotion_money}}</text></text></view></view></block><block wx:if="{{orderData.coupon_money>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">优惠券</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="operator data-v-086933ca">-</text><text class="font-size-goods-tag data-v-086933ca">{{$root.m9}}</text><text class="data-v-086933ca">{{orderData.coupon_money}}</text></text></view></view></block><block wx:if="{{orderData.balance_money>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">使用余额</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="operator data-v-086933ca">-</text><text class="font-size-goods-tag data-v-086933ca">{{$root.m10}}</text><text class="data-v-086933ca">{{orderData.balance_money}}</text></text></view></view></block><block wx:if="{{orderData.point_money>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">积分抵扣</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="operator data-v-086933ca">-</text><text class="font-size-goods-tag data-v-086933ca">{{$root.m11}}</text><text class="data-v-086933ca">{{orderData.point_money}}</text></text></view></view></block><view class="order-cell data-v-086933ca"><view class="box align-right data-v-086933ca"><text class="data-v-086933ca">实付金额：</text><text class="color-base-text price-font data-v-086933ca"><text class="font-size-goods-tag data-v-086933ca">{{$root.m12}}</text><text class="font-size-base data-v-086933ca">{{orderData.order_money}}</text></text></view></view><block wx:if="{{$root.g26>0}}"><view class="order-action fixed-bottom bottom-safe-area data-v-086933ca"><block wx:if="{{evaluateConfig.evaluate_status==1&&orderData.is_evaluate==1}}"><view data-event-opts="{{[['tap',[['operation',['memberOrderEvaluation']]]]]}}" class="order-box-btn white data-v-086933ca" bindtap="__e"><block wx:if="{{orderData.evaluate_status==0}}"><text class="data-v-086933ca">评价</text></block><block wx:else><block wx:if="{{orderData.evaluate_status==1}}"><text class="data-v-086933ca">追评</text></block></block></view></block><block wx:if="{{orderData.order_scene=='online'}}"><block class="data-v-086933ca"><block wx:for="{{orderData.action}}" wx:for-item="operationItem" wx:for-index="operationIndex" wx:key="operationIndex"><view data-event-opts="{{[['tap',[['operation',['$0'],[[['orderData.action','',operationIndex,'action']]]]]]]}}" class="{{['order-box-btn','data-v-086933ca',(operationItem.action=='orderPay')?'color-base-border color-base-bg':'']}}" bindtap="__e">{{''+operationItem.title+''}}</view></block></block></block></view></block><block wx:else><block wx:if="{{$root.g27}}"><view class="order-action fixed-bottom bottom-safe-area data-v-086933ca"><view data-event-opts="{{[['tap',[['operation',['memberOrderEvaluation']]]]]}}" class="order-box-btn white data-v-086933ca" bindtap="__e"><block wx:if="{{orderData.evaluate_status==0}}"><text class="data-v-086933ca">评价</text></block><block wx:else><block wx:if="{{orderData.evaluate_status==1}}"><text class="data-v-086933ca">追评</text></block></block></view></view></block></block></view><block wx:if="{{$root.g28}}"><view class="fixed-bottom-box bottom-safe-area data-v-086933ca"></view></block><ns-goods-recommend vue-id="a2b0478a-2" route="order_detail" data-ref="goodrecommend" class="data-v-086933ca vue-ref" bind:__l="__l"></ns-goods-recommend><ns-payment vue-id="a2b0478a-3" data-ref="choosePaymentPopup" class="data-v-086933ca vue-ref" bind:__l="__l"></ns-payment><loading-cover vue-id="a2b0478a-4" data-ref="loadingCover" class="data-v-086933ca vue-ref" bind:__l="__l"></loading-cover></view>
\ No newline at end of file
+<page-meta page-style="{{themeColor}}" class="data-v-086933ca"></page-meta><view class="{{['detail-container','data-v-086933ca',(isIphoneX)?'safe-area':'']}}"><view class="status-wrap color-base-bg data-v-086933ca" style="{{'background-image:'+('url('+$root.g0+')')+';'}}"><view class="order-status-left data-v-086933ca"><image src="{{$root.g1}}" class="data-v-086933ca"></image><view class="status-name data-v-086933ca"><view class="name data-v-086933ca">{{''+orderData.order_status_name+''}}<block wx:if="{{orderData.promotion_status_name}}"><text class="data-v-086933ca">{{"（"+orderData.promotion_status_name+"）"}}</text></block></view><block wx:if="{{orderData.promotion_type=='presale'&&orderData.order_status==1}}"><view class="desc data-v-086933ca">{{'预计'+$root.g2+'日后发货'}}</view></block><block wx:if="{{orderData.close_cause}}"><view class="desc data-v-086933ca">{{"订单关闭原因："+orderData.close_cause}}</view></block></view></view><block wx:if="{{orderData.order_status==0}}"><view class="order-time data-v-086933ca" id="action-date">剩余时间：<uni-count-down vue-id="a2b0478a-1" day="{{orderData.closeTimeMachine.d}}" hour="{{orderData.closeTimeMachine.h}}" minute="{{orderData.closeTimeMachine.i}}" second="{{orderData.closeTimeMachine.s}}" color="#fff" splitorColor="#fff" class="data-v-086933ca" bind:__l="__l"></uni-count-down></view></block></view><block wx:if="{{orderData.order_type==1||orderData.order_type==3}}"><view class="address-wrap data-v-086933ca"><view class="icon data-v-086933ca"><view class="iconfont icon-location data-v-086933ca"></view></view><view class="address-info data-v-086933ca"><view class="info data-v-086933ca"><text class="font-size-base data-v-086933ca">{{orderData.name+" "+orderData.mobile}}</text></view><view class="detail data-v-086933ca"><text class="font-size-base data-v-086933ca">{{"收货地址："+orderData.full_address+" "+orderData.address}}</text></view></view><block wx:if="{{orderData.order_type==3}}"><view class="pick-block first-pick-block data-v-086933ca"><view class="font-size-base data-v-086933ca">送达时间：</view><view class="last-child data-v-086933ca">{{orderData.buyer_ask_delivery_time}}</view></view><block wx:if="{{orderData.package_list}}"><block class="data-v-086933ca"><view class="pick-block data-v-086933ca"><view class="data-v-086933ca">配送员：</view><view class="last-child data-v-086933ca">{{orderData.package_list.deliverer}}</view></view><view class="pick-block data-v-086933ca"><view class="data-v-086933ca">外卖电话：</view><view class="last-child data-v-086933ca">{{orderData.package_list.deliverer_mobile}}</view></view></block></block></block></view></block><block wx:if="{{orderData.order_type==2}}"><view class="store-wrap data-v-086933ca"><view class="data-v-086933ca"><block wx:if="{{orderData.delivery_store_info}}"><view class="store-info data-v-086933ca"><view class="icon data-v-086933ca"><view class="iconfont icon-mendian data-v-086933ca"></view></view><view class="store-info-detail data-v-086933ca"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="store-name data-v-086933ca" bindtap="__e"><text class="name font-size-base data-v-086933ca">{{orderData.delivery_store_name}}</text><text class="iconfont icon-right font-size-base data-v-086933ca"></text></view><view class="detail store-detail data-v-086933ca"><block wx:if="{{orderData.delivery_store_info.open_date}}"><view class="color-tip data-v-086933ca">{{'营业时间：'+orderData.delivery_store_info.open_date}}</view></block><view class="color-tip data-v-086933ca">{{"地址："+orderData.delivery_store_info.full_address}}</view></view></view></view></block><block wx:else><view class="data-v-086933ca"><view class="address-empty data-v-086933ca"><view class="color-base-text data-v-086933ca">当前无自提门店</view></view></view></block></view><view class="pick-block first-pick-block data-v-086933ca"><view class="font-size-base data-v-086933ca">姓名</view><input class="last-child data-v-086933ca" type="text" disabled="{{true}}" value="{{orderData.name}}"/></view><view class="pick-block first-pick-block data-v-086933ca"><view class="font-size-base data-v-086933ca">预留手机</view><input class="last-child data-v-086933ca" type="number" disabled="{{true}}" value="{{orderData.mobile}}"/></view><view class="pick-block first-pick-block data-v-086933ca"><view class="font-size-base data-v-086933ca">提货时间</view><input class="last-child data-v-086933ca" disabled="{{true}}" value="{{orderData.buyer_ask_delivery_time}}"/></view></view><block wx:if="{{orderData.pay_status}}"><view class="pickup-info data-v-086933ca"><view class="pickup-code-info data-v-086933ca"><view class="info data-v-086933ca"><text class="font-size-base data-v-086933ca"><text class="color-tip font-size-base data-v-086933ca">提货码：</text>{{''+orderData.delivery_code+''}}</text><text data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="copy data-v-086933ca" bindtap="__e">复制</text></view><view class="code data-v-086933ca"><image class="barcode data-v-086933ca" src="{{$root.g3}}" mode="widthFix" data-event-opts="{{[['tap',[['e2',['$event']]]]]}}" bindtap="__e"></image><image class="qrcode data-v-086933ca" src="{{$root.g4}}" mode="widthFix" data-event-opts="{{[['tap',[['e3',['$event']]]]]}}" bindtap="__e"></image></view></view></view></block></block><view class="site-wrap data-v-086933ca" style="{{(orderData.order_type==4?'margin-top: -69rpx;':'')}}"><view class="site-body data-v-086933ca"><block wx:for="{{$root.l3}}" wx:for-item="goodsItem" wx:for-index="goodsIndex" wx:key="goodsIndex"><view class="goods-item data-v-086933ca"><view class="goods-wrap data-v-086933ca"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['orderData.order_goods','',goodsIndex]]]]]]]}}" class="goods-img data-v-086933ca" bindtap="__e"><image src="{{goodsItem.g5}}" mode="aspectFill" data-event-opts="{{[['error',[['imageError',[goodsIndex]]]]]}}" binderror="__e" class="data-v-086933ca"></image></view><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['orderData.order_goods','',goodsIndex]]]]]]]}}" class="goods-info data-v-086933ca" bindtap="__e"><view class="goods-name data-v-086933ca">{{goodsItem.$orig.sku_name}}</view><block wx:if="{{goodsItem.$orig.sku_spec_format}}"><view class="sku data-v-086933ca"><view class="goods-spec data-v-086933ca"><block wx:for="{{goodsItem.l0}}" wx:for-item="x" wx:for-index="i" wx:key="i"><block class="data-v-086933ca">{{''+x.$orig.spec_value_name+"\n\t\t\t\t\t\t\t\t\t"+(i<x.g6-1?'; ':'')+''}}</block></block></view></view></block><view class="goods-sub-section data-v-086933ca"><view class="data-v-086933ca"><text class="goods-price data-v-086933ca"><text class="unit price-style small data-v-086933ca">{{$root.m0}}</text><text class="price-style large data-v-086933ca">{{goodsItem.g7[0]}}</text><text class="unit price-style small data-v-086933ca">{{"."+goodsItem.g8[1]}}</text></text></view><view class="data-v-086933ca"><text class="font-size-base data-v-086933ca"><text class="iconfont icon-close data-v-086933ca"></text>{{''+goodsItem.$orig.num+''}}</text></view></view><block wx:if="{{goodsItem.$orig.card_item_id}}"><view class="goods-card data-v-086933ca">次卡抵扣<text class="goods-price data-v-086933ca"><text class="unit price-style small data-v-086933ca">{{"-"+goodsItem.m1}}</text><text class="price-style large data-v-086933ca">{{goodsItem.g9[0]}}</text><text class="unit price-style small data-v-086933ca">{{"."+goodsItem.g10[1]}}</text></text></view></block></view></view><block wx:if="{{goodsItem.$orig.form}}"><view class="goods-form data-v-086933ca"><block wx:for="{{goodsItem.l2}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">{{item.$orig.value.title+"："}}</text><block wx:if="{{item.$orig.controller=='Img'}}"><view class="box img-box data-v-086933ca"><block wx:for="{{item.l1}}" wx:for-item="img" wx:for-index="imgIndex" wx:key="imgIndex"><view class="img data-v-086933ca"><image src="{{img.g11}}" mode="widthFix" data-event-opts="{{[['tap',[['e4',['$event']]]]]}}" data-event-params="{{({img:img.$orig})}}" bindtap="__e" class="data-v-086933ca"></image></view></block></view></block><block wx:else><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{item.$orig.val}}</text><text data-event-opts="{{[['tap',[['e5',['$event']]]]]}}" data-event-params="{{({item:item.$orig})}}" class="copy data-v-086933ca" bindtap="__e">复制</text></view></block></view></block></view></block><view class="goods-action data-v-086933ca"><block wx:if="{{orderData.is_enable_refund}}"><block class="data-v-086933ca"><block wx:if="{{orderData.order_scene=='online'&&(goodsItem.$orig.refund_status==0||goodsItem.$orig.refund_status==-1)}}"><view data-event-opts="{{[['tap',[['goRefund',['$0'],[[['orderData.order_goods','',goodsIndex,'order_goods_id']]]]]]]}}" bindtap="__e" class="data-v-086933ca"><block wx:if="{{orderData.promotion_type!='blindbox'}}"><view class="order-box-btn data-v-086933ca">{{''+(orderData.order_status==10?'申请售后':'申请退款')+''}}</view></block></view></block></block></block><block wx:if="{{goodsItem.$orig.refund_status!=0&&goodsItem.$orig.refund_status!=-1}}"><view data-event-opts="{{[['tap',[['goRefundDetail',['$0'],[[['orderData.order_goods','',goodsIndex,'order_goods_id']]]]]]]}}" bindtap="__e" class="data-v-086933ca"><view class="order-box-btn data-v-086933ca">{{orderData.order_status==10?'查看售后':'查看退款'}}</view></view></block></view></view></block></view></view><view class="order-summary data-v-086933ca"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">订单类型：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.order_type_name}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">订单编号：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.order_no}}</text><view data-event-opts="{{[['tap',[['e6',['$event']]]]]}}" class="copy data-v-086933ca" bindtap="__e">复制</view></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">订单交易号：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.out_trade_no}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">创建时间：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{$root.g12}}</text></view></view><block wx:if="{{orderData.close_time>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">关闭时间：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{$root.g13}}</text></view></view></block><block wx:if="{{orderData.pay_status>0}}"><block class="data-v-086933ca"><view class="hr data-v-086933ca"></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">支付方式：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.pay_type_name}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">支付时间：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{$root.g14}}</text></view></view></block></block><block wx:if="{{orderData.delivery_type_name}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">配送方式：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.delivery_type_name}}</text></view></view></block><block wx:if="{{orderData.buyer_message!=''}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">买家留言：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.buyer_message}}</text></view></view></block><block wx:if="{{orderData.promotion_type_name!=''}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">活动优惠：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.promotion_type_name}}</text></view></view></block><block wx:if="{{orderData.is_invoice>0}}"><block class="data-v-086933ca"><view class="hr data-v-086933ca"></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">发票类型：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.invoice_type==1?'纸质发票':'电子发票'}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">发票抬头类型：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.invoice_title_type==1?'个人':'企业'}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">发票抬头：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.invoice_title}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">发票内容：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.invoice_content}}</text></view></view><block wx:if="{{orderData.invoice_type==1}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">发票邮寄地址：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.invoice_full_address}}</text></view></view></block><block wx:else><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">发票接收邮件：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{orderData.invoice_email}}</text></view></view></block></block></block><block wx:if="{{orderData.form}}"><block class="data-v-086933ca"><view class="hr data-v-086933ca"></view><block wx:for="{{$root.l5}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="order-cell order-form data-v-086933ca"><text class="tit data-v-086933ca">{{item.$orig.value.title+"："}}</text><block wx:if="{{item.$orig.controller=='Img'}}"><view class="box img-box data-v-086933ca"><block wx:for="{{item.l4}}" wx:for-item="img" wx:for-index="imgIndex" wx:key="imgIndex"><view class="img data-v-086933ca"><image src="{{img.g15}}" mode="widthFix" data-event-opts="{{[['tap',[['e7',['$event']]]]]}}" data-event-params="{{({img:img.$orig})}}" bindtap="__e" class="data-v-086933ca"></image></view></block></view></block><block wx:else><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{item.$orig.val}}</text><text data-event-opts="{{[['tap',[['e8',['$event']]]]]}}" data-event-params="{{({item:item.$orig})}}" class="copy data-v-086933ca" bindtap="__e">复制</text></view></block></view></block></block></block><block wx:if="{{orderData.goods_class==5}}"><block class="data-v-086933ca"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">我的卡包：</text><view class="box data-v-086933ca"><text data-event-opts="{{[['tap',[['e9',['$event']]]]]}}" class="color-base-text data-v-086933ca" bindtap="__e">查看</text></view></view></block></block></view><block wx:if="{{orderData.virtual_goods&&orderData.goods_class==2&&orderData.virtual_goods.is_veirfy==0}}"><block class="data-v-086933ca"><view class="verify-code-wrap data-v-086933ca"><view class="code data-v-086933ca"><image class="barcode data-v-086933ca" src="{{$root.g16}}" mode="widthFix"></image><image class="qrcode data-v-086933ca" src="{{$root.g17}}" mode="widthFix"></image><text class="data-v-086933ca">请将条形码或二维码出示给核销员</text></view><view class="hr data-v-086933ca"></view><view class="wrap data-v-086933ca"><text class="font-size-base virtual-code data-v-086933ca">{{orderData.virtual_code}}</text><view data-event-opts="{{[['tap',[['e10',['$event']]]]]}}" class="copy data-v-086933ca" bindtap="__e">复制</view></view></view><view class="verify-info-wrap data-v-086933ca"><view class="head data-v-086933ca">核销信息</view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">核销次数</text><view class="box align-right data-v-086933ca"><text class="color-title data-v-086933ca">{{'剩余'+(orderData.virtual_goods.verify_total_count-orderData.virtual_goods.verify_use_num)+"次/共"+orderData.virtual_goods.verify_total_count+'次'}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">有效期</text><view class="box align-right data-v-086933ca"><block wx:if="{{orderData.virtual_goods.expire_time>0}}"><text class="color-title data-v-086933ca">{{$root.g18}}</text></block><block wx:else><text class="data-v-086933ca">永久有效</text></block></view></view></view><view class="verify-info-wrap data-v-086933ca"><view class="head data-v-086933ca">核销记录</view><block wx:if="{{$root.g19}}"><view class="data-v-086933ca"><block wx:for="{{$root.l6}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="record-item data-v-086933ca"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">核销人</text><view class="box align-right data-v-086933ca"><text class="color-title data-v-086933ca">{{item.$orig.verifier_name}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">核销时间</text><view class="box align-right data-v-086933ca"><text class="color-title data-v-086933ca">{{item.g20}}</text></view></view></view></block></view></block><block wx:else><view class="record-empty data-v-086933ca">暂无核销记录</view></block></view></block></block><block wx:if="{{orderData.virtual_goods&&orderData.goods_class==3}}"><block class="data-v-086933ca"><view class="verify-info-wrap carmichael data-v-086933ca"><view class="head data-v-086933ca">卡密信息</view><block wx:for="{{orderData.virtual_goods}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="record-item data-v-086933ca"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">卡号：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{item.card_info.cardno}}</text><view data-event-opts="{{[['tap',[['e11',['$event']]]]]}}" data-event-params="{{({item})}}" class="copy data-v-086933ca" bindtap="__e">复制</view></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">密码：</text><view class="box data-v-086933ca"><text class="color-title data-v-086933ca">{{item.card_info.password}}</text><view data-event-opts="{{[['tap',[['e12',['$event']]]]]}}" data-event-params="{{({item})}}" class="copy data-v-086933ca" bindtap="__e">复制</view></view></view></view></block></view></block></block><block wx:if="{{orderData.virtual_goods&&orderData.goods_class==4}}"><block class="data-v-086933ca"><block wx:if="{{orderData.virtual_goods.is_veirfy==0}}"><view class="verify-code-wrap data-v-086933ca"><view class="code data-v-086933ca"><image class="barcode data-v-086933ca" src="{{$root.g21}}" mode="widthFix"></image><image class="qrcode data-v-086933ca" src="{{$root.g22}}" mode="widthFix"></image><text class="data-v-086933ca">请将条形码或二维码出示给核销员</text></view><view class="hr data-v-086933ca"></view><view class="wrap data-v-086933ca"><text class="font-size-base virtual-code data-v-086933ca">{{orderData.virtual_code}}</text><view data-event-opts="{{[['tap',[['e13',['$event']]]]]}}" class="copy data-v-086933ca" bindtap="__e">复制</view></view></view></block><view class="verify-info-wrap data-v-086933ca"><view class="head data-v-086933ca">核销信息</view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">核销次数</text><view class="box align-right data-v-086933ca"><text class="color-title data-v-086933ca">{{'剩余'+(orderData.virtual_goods.verify_total_count-orderData.virtual_goods.verify_use_num)+"次/共"+orderData.virtual_goods.verify_total_count+'次'}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">有效期</text><view class="box align-right data-v-086933ca"><block wx:if="{{orderData.virtual_goods.expire_time>0}}"><text class="color-title data-v-086933ca">{{$root.g23}}</text></block><block wx:else><text class="data-v-086933ca">永久有效</text></block></view></view></view><view class="verify-info-wrap data-v-086933ca"><view class="head data-v-086933ca">核销记录</view><block wx:if="{{$root.g24}}"><view class="data-v-086933ca"><block wx:for="{{$root.l7}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="record-item data-v-086933ca"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">核销人</text><view class="box align-right data-v-086933ca"><text class="color-title data-v-086933ca">{{item.$orig.verifier_name}}</text></view></view><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">核销时间</text><view class="box align-right data-v-086933ca"><text class="color-title data-v-086933ca">{{item.g25}}</text></view></view></view></block></view></block><block wx:else><view class="record-empty data-v-086933ca">暂无核销记录</view></block></view></block></block><view class="order-money data-v-086933ca"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">商品金额</text><view class="box align-right data-v-086933ca"><text class="color-title price-font data-v-086933ca"><text class="font-size-goods-tag data-v-086933ca">{{$root.m2}}</text>{{''+orderData.goods_money+''}}</text></view></view><block wx:if="{{orderData.order_type!=4}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">运费</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="font-size-goods-tag data-v-086933ca">{{$root.m3}}</text><text class="data-v-086933ca">{{orderData.delivery_money}}</text></text></view></view></block><block wx:if="{{orderData.member_card_money>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">会员卡</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="font-size-goods-tag data-v-086933ca">{{$root.m4}}</text><text class="data-v-086933ca">{{orderData.member_card_money}}</text></text></view></view></block><block wx:if="{{orderData.invoice_money>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">税费<text class="color-base-text data-v-086933ca">{{"("+orderData.invoice_rate+"%)"}}</text></text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="operator data-v-086933ca">+</text><text class="font-size-goods-tag data-v-086933ca">{{$root.m5}}</text><text class="data-v-086933ca">{{orderData.invoice_money}}</text></text></view></view></block><block wx:if="{{orderData.invoice_delivery_money>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">发票邮寄费</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="operator data-v-086933ca">+</text><text class="font-size-goods-tag data-v-086933ca">{{$root.m6}}</text><text class="data-v-086933ca">{{orderData.invoice_delivery_money}}</text></text></view></view></block><block wx:if="{{orderData.adjust_money!=0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">订单调整</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><block wx:if="{{orderData.adjust_money<0}}"><text class="operator data-v-086933ca">-</text></block><block wx:else><text class="operator data-v-086933ca">+</text></block><text class="font-size-goods-tag data-v-086933ca">{{$root.m7}}</text><text class="data-v-086933ca">{{$root.f0}}</text></text></view></view></block><block wx:if="{{orderData.promotion_money>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">优惠</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="operator data-v-086933ca">-</text><text class="font-size-goods-tag data-v-086933ca">{{$root.m8}}</text><text class="data-v-086933ca">{{orderData.promotion_money}}</text></text></view></view></block><block wx:if="{{orderData.coupon_money>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">优惠券</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="operator data-v-086933ca">-</text><text class="font-size-goods-tag data-v-086933ca">{{$root.m9}}</text><text class="data-v-086933ca">{{orderData.coupon_money}}</text></text></view></view></block><block wx:if="{{orderData.balance_money>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">使用余额</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="operator data-v-086933ca">-</text><text class="font-size-goods-tag data-v-086933ca">{{$root.m10}}</text><text class="data-v-086933ca">{{orderData.balance_money}}</text></text></view></view></block><block wx:if="{{orderData.point_money>0}}"><view class="order-cell data-v-086933ca"><text class="tit data-v-086933ca">积分抵扣</text><view class="box align-right data-v-086933ca"><text class="color-base-text price-font data-v-086933ca"><text class="operator data-v-086933ca">-</text><text class="font-size-goods-tag data-v-086933ca">{{$root.m11}}</text><text class="data-v-086933ca">{{orderData.point_money}}</text></text></view></view></block><view class="order-cell data-v-086933ca"><view class="box align-right data-v-086933ca"><text class="data-v-086933ca">实付金额：</text><text class="color-base-text price-font data-v-086933ca"><text class="font-size-goods-tag data-v-086933ca">{{$root.m12}}</text><text class="font-size-base data-v-086933ca">{{orderData.order_money}}</text></text></view></view><block wx:if="{{$root.g26>0}}"><view class="order-action fixed-bottom bottom-safe-area data-v-086933ca"><block wx:if="{{evaluateConfig.evaluate_status==1&&orderData.is_evaluate==1}}"><view data-event-opts="{{[['tap',[['operation',['memberOrderEvaluation']]]]]}}" class="order-box-btn white data-v-086933ca" bindtap="__e"><block wx:if="{{orderData.evaluate_status==0}}"><text class="data-v-086933ca">评价</text></block><block wx:else><block wx:if="{{orderData.evaluate_status==1}}"><text class="data-v-086933ca">追评</text></block></block></view></block><block wx:if="{{orderData.order_scene=='online'}}"><block class="data-v-086933ca"><block wx:for="{{orderData.action}}" wx:for-item="operationItem" wx:for-index="operationIndex" wx:key="operationIndex"><view data-event-opts="{{[['tap',[['operation',['$0'],[[['orderData.action','',operationIndex,'action']]]]]]]}}" class="{{['order-box-btn','data-v-086933ca',(operationItem.action=='orderPay')?'color-base-border color-base-bg':'']}}" bindtap="__e">{{''+operationItem.title+''}}</view></block></block></block></view></block><block wx:else><block wx:if="{{$root.g27}}"><view class="order-action fixed-bottom bottom-safe-area data-v-086933ca"><view data-event-opts="{{[['tap',[['operation',['memberOrderEvaluation']]]]]}}" class="order-box-btn white data-v-086933ca" bindtap="__e"><block wx:if="{{orderData.evaluate_status==0}}"><text class="data-v-086933ca">评价</text></block><block wx:else><block wx:if="{{orderData.evaluate_status==1}}"><text class="data-v-086933ca">追评</text></block></block></view></view></block></block></view><block wx:if="{{$root.g28}}"><view class="fixed-bottom-box bottom-safe-area data-v-086933ca"></view></block><ns-goods-recommend vue-id="a2b0478a-2" route="order_detail" data-ref="goodrecommend" class="data-v-086933ca vue-ref" bind:__l="__l"></ns-goods-recommend><ns-payment vue-id="a2b0478a-3" data-ref="choosePaymentPopup" class="data-v-086933ca vue-ref" bind:__l="__l"></ns-payment><loading-cover vue-id="a2b0478a-4" data-ref="loadingCover" class="data-v-086933ca vue-ref" bind:__l="__l"></loading-cover></view>
\ No newline at end of file
diff --git a/pages_tool/order/logistics.wxml b/pages_tool/order/logistics.wxml
index fab6d03..806dd63 100644
--- a/pages_tool/order/logistics.wxml
+++ b/pages_tool/order/logistics.wxml
@@ -1 +1 @@
-<page-meta page-style="{{themeColor}}"></page-meta><view><scroll-view class="order-nav" scroll-x="{{true}}" show-scrollbar="{{false}}"><block wx:for="{{packageList}}" wx:for-item="packageItem" wx:for-index="packageIndex" wx:key="packageIndex"><view data-event-opts="{{[['tap',[['ontabtap',[packageIndex]]]]]}}" class="uni-tab-item" bindtap="__e"><text class="{{['uni-tab-item-title',packageIndex==currIndex?'uni-tab-item-title-active color-base-border  color-base-text':'']}}">{{''+packageItem.package_name+''}}</text></view></block></scroll-view><block wx:for="{{$root.l1}}" wx:for-item="packageItem" wx:for-index="packageIndex" wx:key="packageIndex"><view hidden="{{!(packageIndex==currIndex)}}" class="swiper-item"><view class="container"><view class="goods-wrap"><view class="body"><block wx:for="{{packageItem.l0}}" wx:for-item="goodsItem" wx:for-index="goodsIndex" wx:key="goodsIndex"><view class="goods"><view data-event-opts="{{[['tap',[['toGoodsDetail',['$0'],[[['packageList','',packageIndex],['goods_list','',goodsIndex,'sku_id']]]]]]]}}" class="goods-img" bindtap="__e"><image src="{{goodsItem.g0}}" mode="aspectFill" data-event-opts="{{[['error',[['imageError',[packageIndex,goodsIndex]]]]]}}" binderror="__e"></image></view><view class="goods-info"><view data-event-opts="{{[['tap',[['toGoodsDetail',['$0'],[[['packageList','',packageIndex],['goods_list','',goodsIndex,'sku_id']]]]]]]}}" class="goods-name" bindtap="__e">{{goodsItem.$orig.sku_name}}</view><view class="goods-sub-section"><view><text><text class="iconfont icon-close"></text>{{''+goodsItem.$orig.num+''}}</text></view></view></view></view></block></view></view><block wx:if="{{packageItem.$orig.delivery_type==1}}"><view class="express-company-wrap"><view class="company-logo"><image src="{{packageItem.g1}}"></image></view><view class="info"><view class="company"><text>{{"承运公司： "+packageItem.$orig.express_company_name}}</text></view><view class="no"><text>运单号：<text class="color-tip">{{packageItem.$orig.delivery_no}}</text></text><text data-event-opts="{{[['tap',[['copyDeliveryNo',['$0'],[[['packageList','',packageIndex,'delivery_no']]]]]]]}}" class="iconfont icon-fuzhi" bindtap="__e"></text></view></view></view></block><block wx:if="{{packageItem.$orig.delivery_type==1}}"><view class="track-wrap"><block wx:if="{{packageItem.g2}}"><block><block wx:for="{{packageItem.$orig.trace.list}}" wx:for-item="traceItem" wx:for-index="traceIndex" wx:key="traceIndex"><view class="{{['track-item',traceIndex==0?'active':'']}}"><view class="{{['dot',traceIndex==0?'color-base-bg':'']}}"></view><view class="msg"><view class="{{['text',traceIndex==0?'color-base-text':'']}}">{{traceItem.remark}}</view><view class="{{['time',traceIndex==0?'color-base-text':'']}}">{{traceItem.datetime}}</view></view></view></block></block></block><block wx:else><block wx:if="{{packageItem.g3}}"><block><view class="fail-wrap font-size-base">{{packageItem.$orig.trace.reason}}</view></block></block><block wx:else><block><view class="fail-wrap font-size-base">{{packageItem.$orig.trace.reason}}</view></block></block></block></view></block></view></view></block><loading-cover class="vue-ref" vue-id="747bb8c2-1" data-ref="loadingCover" bind:__l="__l"></loading-cover></view>
\ No newline at end of file
+<page-meta page-style="{{themeColor}}"></page-meta><view><scroll-view class="order-nav" scroll-x="{{true}}" show-scrollbar="{{false}}"><block wx:for="{{packageList}}" wx:for-item="packageItem" wx:for-index="packageIndex" wx:key="packageIndex"><view data-event-opts="{{[['tap',[['ontabtap',[packageIndex]]]]]}}" class="uni-tab-item" bindtap="__e"><text class="{{['uni-tab-item-title',packageIndex==currIndex?'uni-tab-item-title-active color-base-border color-base-text':'']}}">{{''+packageItem.package_name+''}}</text></view></block></scroll-view><block wx:for="{{$root.l1}}" wx:for-item="packageItem" wx:for-index="packageIndex" wx:key="packageIndex"><view hidden="{{!(packageIndex==currIndex)}}" class="swiper-item"><view class="container"><view class="goods-wrap"><view class="body"><block wx:for="{{packageItem.l0}}" wx:for-item="goodsItem" wx:for-index="goodsIndex" wx:key="goodsIndex"><view class="goods"><view data-event-opts="{{[['tap',[['toGoodsDetail',['$0'],[[['packageList','',packageIndex],['goods_list','',goodsIndex,'sku_id']]]]]]]}}" class="goods-img" bindtap="__e"><image src="{{goodsItem.g0}}" mode="aspectFill" data-event-opts="{{[['error',[['imageError',[packageIndex,goodsIndex]]]]]}}" binderror="__e"></image></view><view class="goods-info"><view data-event-opts="{{[['tap',[['toGoodsDetail',['$0'],[[['packageList','',packageIndex],['goods_list','',goodsIndex,'sku_id']]]]]]]}}" class="goods-name" bindtap="__e">{{goodsItem.$orig.sku_name}}</view><view class="goods-sub-section"><view><text><text class="iconfont icon-close"></text>{{''+goodsItem.$orig.num+''}}</text></view></view></view></view></block></view></view><block wx:if="{{packageItem.$orig.delivery_type==1}}"><view class="express-company-wrap"><view class="company-logo"><image src="{{packageItem.g1}}"></image></view><view class="info"><view class="company"><text>{{"承运公司： "+packageItem.$orig.express_company_name}}</text></view><view class="no"><text>运单号：<text class="color-tip">{{packageItem.$orig.delivery_no}}</text></text><text data-event-opts="{{[['tap',[['copyDeliveryNo',['$0'],[[['packageList','',packageIndex,'delivery_no']]]]]]]}}" class="iconfont icon-fuzhi" bindtap="__e"></text></view></view></view></block><block wx:if="{{packageItem.$orig.delivery_type==1}}"><view class="track-wrap"><block wx:if="{{packageItem.g2}}"><block><block wx:for="{{packageItem.$orig.trace.list}}" wx:for-item="traceItem" wx:for-index="traceIndex" wx:key="traceIndex"><view class="{{['track-item',traceIndex==0?'active':'']}}"><view class="{{['dot',traceIndex==0?'color-base-bg':'']}}"></view><view class="msg"><view class="{{['text',traceIndex==0?'color-base-text':'']}}">{{traceItem.remark}}</view><view class="{{['time',traceIndex==0?'color-base-text':'']}}">{{traceItem.datetime}}</view></view></view></block></block></block><block wx:else><block wx:if="{{packageItem.g3}}"><block><view class="fail-wrap font-size-base">{{packageItem.$orig.trace.reason}}</view></block></block><block wx:else><block><view class="fail-wrap font-size-base">{{packageItem.$orig.trace.reason}}</view></block></block></block></view></block></view></view></block><loading-cover class="vue-ref" vue-id="747bb8c2-1" data-ref="loadingCover" bind:__l="__l"></loading-cover></view>
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 34e2dab..142b78f 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1 +1,62 @@
-{"description":"项目配置文件。","packOptions":{"ignore":[],"include":[]},"setting":{"urlCheck":false,"es6":true,"postcss":false,"minified":true,"newFeature":true,"bigPackageSizeSupport":true,"babelSetting":{"ignore":[],"disablePlugins":[],"outputPath":""},"ignoreUploadUnusedFiles":false,"compileWorklet":false,"uglifyFileName":false,"uploadWithSourceMap":true,"enhance":false,"packNpmManually":false,"packNpmRelationList":[],"minifyWXSS":true,"minifyWXML":true,"localPlugins":false,"disableUseStrict":false,"useCompilerPlugins":false,"condition":false,"swc":false,"disableSWC":true},"compileType":"miniprogram","libVersion":"2.27.3","appid":"wx29215aa1bd97bbd6","projectname":"lucky_weapp","condition":{"search":{"current":-1,"list":[]},"conversation":{"current":-1,"list":[]},"game":{"current":-1,"list":[]},"miniprogram":{"current":-1,"list":[]}},"editorSetting":{"tabIndent":"insertSpaces","tabSize":2},"simulatorPluginLibVersion":{}}
\ No newline at end of file
+{
+  "description": "项目配置文件。",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": true,
+    "postcss": false,
+    "minified": true,
+    "newFeature": true,
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "ignoreUploadUnusedFiles": true,
+    "compileWorklet": false,
+    "uglifyFileName": false,
+    "uploadWithSourceMap": true,
+    "enhance": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "minifyWXML": true,
+    "localPlugins": false,
+    "disableUseStrict": false,
+    "useCompilerPlugins": false,
+    "condition": false,
+    "swc": false,
+    "disableSWC": true
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.27.3",
+  "appid": "wx29215aa1bd97bbd6",
+  "projectname": "lucky_weapp",
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": []
+    }
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  },
+  "simulatorPluginLibVersion": {}
+}
\ No newline at end of file
diff --git a/uni_modules/mp-html/components/mp-html/node/node.wxml b/uni_modules/mp-html/components/mp-html/node/node.wxml
index e7c1ca0..87c98c2 100644
--- a/uni_modules/mp-html/components/mp-html/node/node.wxml
+++ b/uni_modules/mp-html/components/mp-html/node/node.wxml
@@ -1,29 +1 @@
-<wxs module="handler">
-// 行内标签列表
-var inlineTags = {
-  abbr: true,
-  b: true,
-  big: true,
-  code: true,
-  del: true,
-  em: true,
-  i: true,
-  ins: true,
-  label: true,
-  q: true,
-  small: true,
-  span: true,
-  strong: true,
-  sub: true,
-  sup: true
-}
-/**
- * @description 判断是否为行内标签
- */
-module.exports = {
-  isInline: function (tagName, style) {
-    return inlineTags[tagName] || (style || '').indexOf('display:inline') !== -1
-  }
-}
-</wxs>
-<view class="{{['_block _'+name+' '+attrs.class]}}" style="{{(attrs.style)}}" id="{{attrs.id}}"><block wx:for="{{childs}}" wx:for-item="n" wx:for-index="i" wx:key="i"><block><block wx:if="{{n.name==='img'&&!n.t&&(opts[1]&&!ctrl[i]||ctrl[i]<0)}}"><image class="_img" style="{{(n.attrs.style)}}" src="{{ctrl[i]<0?opts[2]:opts[1]}}" mode="widthFix"></image></block><block wx:if="{{n.name==='img'&&n.t}}"><rich-text style="{{('display:'+n.t)}}" nodes="{{[{attrs:{style:n.attrs.style||'',src:n.attrs.src},name:'img'}]}}" data-i="{{i}}" data-event-opts="{{[['tap',[['imgTap',['$event']]]]]}}" catchtap="__e"></rich-text></block><block wx:else><block wx:if="{{n.name==='img'}}"><image class="{{['_img '+n.attrs.class]}}" style="{{((ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;height:1px;'+n.attrs.style)}}" id="{{n.attrs.id}}" src="{{n.attrs.src}}" mode="{{!n.h?'widthFix':!n.w?'heightFix':n.m||'scaleToFill'}}" lazy-load="{{opts[0]}}" webp="{{n.webp}}" show-menu-by-longpress="{{opts[3]&&!n.attrs.ignore}}" image-menu-prevent="{{!opts[3]||n.attrs.ignore}}" data-i="{{i}}" data-event-opts="{{[['load',[['imgLoad',['$event']]]],['error',[['mediaError',['$event']]]],['tap',[['imgTap',['$event']]]],['longpress',[['imgLongTap',['$event']]]]]}}" bindload="__e" binderror="__e" catchtap="__e" bindlongpress="__e"></image></block><block wx:else><block wx:if="{{n.text}}"><text user-select="{{opts[4]=='force'&&isiOS}}" decode="{{true}}">{{n.text}}</text></block><block wx:else><block wx:if="{{n.name==='br'}}"><text>\n</text></block><block wx:else><block wx:if="{{n.name==='a'}}"><view class="{{[(n.attrs.href?'_a ':'')+n.attrs.class]}}" style="{{('display:inline;'+n.attrs.style)}}" id="{{n.attrs.id}}" hover-class="_hover" data-i="{{i}}" data-event-opts="{{[['tap',[['linkTap',['$event']]]]]}}" catchtap="__e"><node style="display:inherit;" vue-id="{{'7ee7856b-1-'+i}}" name="span" childs="{{n.children}}" opts="{{opts}}" bind:__l="__l"></node></view></block><block wx:else><block wx:if="{{n.name==='video'}}"><video class="{{[n.attrs.class]}}" style="{{(n.attrs.style)}}" id="{{n.attrs.id}}" autoplay="{{n.attrs.autoplay}}" controls="{{n.attrs.controls}}" loop="{{n.attrs.loop}}" object-fit="{{n.attrs['object-fit']}}" poster="{{n.attrs.poster}}" src="{{n.src[ctrl[i]||0]}}" data-i="{{i}}" data-event-opts="{{[['play',[['play',['$event']]]],['error',[['mediaError',['$event']]]]]}}" muted="{{n.attrs.muted}}" bindplay="__e" binderror="__e"></video></block><block wx:else><block wx:if="{{n.name==='audio'}}"><audio class="{{[n.attrs.class]}}" style="{{(n.attrs.style)}}" id="{{n.attrs.id}}" author="{{n.attrs.author}}" controls="{{n.attrs.controls}}" loop="{{n.attrs.loop}}" name="{{n.attrs.name}}" poster="{{n.attrs.poster}}" src="{{n.src[ctrl[i]||0]}}" data-i="{{i}}" data-event-opts="{{[['play',[['play',['$event']]]],['error',[['mediaError',['$event']]]]]}}" bindplay="__e" binderror="__e"></audio></block><block wx:else><block wx:if="{{n.name==='table'&&n.c||n.name==='li'}}"><view class="{{['_'+n.name+' '+n.attrs.class]}}" style="{{(n.attrs.style)}}" id="{{n.attrs.id}}"><block wx:if="{{n.name==='li'}}"><node vue-id="{{'7ee7856b-2-'+i}}" childs="{{n.children}}" opts="{{opts}}" bind:__l="__l"></node></block><block wx:else><block wx:for="{{n.children}}" wx:for-item="tbody" wx:for-index="x" wx:key="x"><view class="{{['_'+tbody.name+' '+tbody.attrs.class]}}" style="{{(tbody.attrs.style)}}"><block wx:if="{{tbody.name==='td'||tbody.name==='th'}}"><node vue-id="{{'7ee7856b-3-'+i+'-'+x}}" childs="{{tbody.children}}" opts="{{opts}}" bind:__l="__l"></node></block><block wx:else><block wx:for="{{tbody.children}}" wx:for-item="tr" wx:for-index="y" wx:key="y"><block><block wx:if="{{tr.name==='td'||tr.name==='th'}}"><view class="{{['_'+tr.name+' '+tr.attrs.class]}}" style="{{(tr.attrs.style)}}"><node vue-id="{{'7ee7856b-4-'+i+'-'+x+'-'+y}}" childs="{{tr.children}}" opts="{{opts}}" bind:__l="__l"></node></view></block><block wx:else><view class="{{['_'+tr.name+' '+tr.attrs.class]}}" style="{{(tr.attrs.style)}}"><block wx:for="{{tr.children}}" wx:for-item="td" wx:for-index="z" wx:key="z"><view class="{{['_'+td.name+' '+td.attrs.class]}}" style="{{(td.attrs.style)}}"><node vue-id="{{'7ee7856b-5-'+i+'-'+x+'-'+y+'-'+z}}" childs="{{td.children}}" opts="{{opts}}" bind:__l="__l"></node></view></block></view></block></block></block></block></view></block></block></view></block><block wx:else><block wx:if="{{!n.c&&!handler.isInline(n.name,n.attrs.style)}}"><rich-text style="{{(n.f)}}" id="{{n.attrs.id}}" user-select="{{opts[4]}}" nodes="{{[n]}}"></rich-text></block><block wx:else><block wx:if="{{n.c===2}}"><view class="{{['_block _'+n.name+' '+n.attrs.class]}}" style="{{(n.f+';'+n.attrs.style)}}" id="{{n.attrs.id}}"><block wx:for="{{n.children}}" wx:for-item="n2" wx:for-index="j" wx:key="j"><node style="{{(n2.f)}}" vue-id="{{'7ee7856b-6-'+i+'-'+j}}" name="{{n2.name}}" attrs="{{n2.attrs}}" childs="{{n2.children}}" opts="{{opts}}" bind:__l="__l"></node></block></view></block><block wx:else><node style="{{(n.f)}}" vue-id="{{'7ee7856b-7-'+i}}" name="{{n.name}}" attrs="{{n.attrs}}" childs="{{n.children}}" opts="{{opts}}" bind:__l="__l"></node></block></block></block></block></block></block></block></block></block></block></block></block></view>
\ No newline at end of file
+<wxs module="handler">// 行内标签列表 var inlineTags = { abbr: true, b: true, big: true, code: true, del: true, em: true, i: true, ins: true, label: true, q: true, small: true, span: true, strong: true, sub: true, sup: true } /** * @description 判断是否为行内标签 */ module.exports = { isInline: function (tagName, style) { return inlineTags[tagName] || (style || '').indexOf('display:inline') !== -1 } }</wxs><view class="{{['_block _'+name+' '+attrs.class]}}" style="{{(attrs.style)}}" id="{{attrs.id}}"><block wx:for="{{childs}}" wx:for-item="n" wx:for-index="i" wx:key="i"><block><block wx:if="{{n.name==='img'&&!n.t&&(opts[1]&&!ctrl[i]||ctrl[i]<0)}}"><image class="_img" style="{{(n.attrs.style)}}" src="{{ctrl[i]<0?opts[2]:opts[1]}}" mode="widthFix"></image></block><block wx:if="{{n.name==='img'&&n.t}}"><rich-text style="{{('display:'+n.t)}}" nodes="{{[{attrs:{style:n.attrs.style||'',src:n.attrs.src},name:'img'}]}}" data-i="{{i}}" data-event-opts="{{[['tap',[['imgTap',['$event']]]]]}}" catchtap="__e"></rich-text></block><block wx:else><block wx:if="{{n.name==='img'}}"><image class="{{['_img '+n.attrs.class]}}" style="{{((ctrl[i]===-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;height:1px;'+n.attrs.style)}}" id="{{n.attrs.id}}" src="{{n.attrs.src}}" mode="{{!n.h?'widthFix':!n.w?'heightFix':n.m||'scaleToFill'}}" lazy-load="{{opts[0]}}" webp="{{n.webp}}" show-menu-by-longpress="{{opts[3]&&!n.attrs.ignore}}" image-menu-prevent="{{!opts[3]||n.attrs.ignore}}" data-i="{{i}}" data-event-opts="{{[['load',[['imgLoad',['$event']]]],['error',[['mediaError',['$event']]]],['tap',[['imgTap',['$event']]]],['longpress',[['imgLongTap',['$event']]]]]}}" bindload="__e" binderror="__e" catchtap="__e" bindlongpress="__e"></image></block><block wx:else><block wx:if="{{n.text}}"><text user-select="{{opts[4]=='force'&&isiOS}}" decode="{{true}}">{{n.text}}</text></block><block wx:else><block wx:if="{{n.name==='br'}}"><text>\n</text></block><block wx:else><block wx:if="{{n.name==='a'}}"><view class="{{[(n.attrs.href?'_a ':'')+n.attrs.class]}}" style="{{('display:inline;'+n.attrs.style)}}" id="{{n.attrs.id}}" hover-class="_hover" data-i="{{i}}" data-event-opts="{{[['tap',[['linkTap',['$event']]]]]}}" catchtap="__e"><node style="display:inherit;" vue-id="{{'7ee7856b-1-'+i}}" name="span" childs="{{n.children}}" opts="{{opts}}" bind:__l="__l"></node></view></block><block wx:else><block wx:if="{{n.name==='video'}}"><video class="{{[n.attrs.class]}}" style="{{(n.attrs.style)}}" id="{{n.attrs.id}}" autoplay="{{n.attrs.autoplay}}" controls="{{n.attrs.controls}}" loop="{{n.attrs.loop}}" object-fit="{{n.attrs['object-fit']}}" poster="{{n.attrs.poster}}" src="{{n.src[ctrl[i]||0]}}" data-i="{{i}}" data-event-opts="{{[['play',[['play',['$event']]]],['error',[['mediaError',['$event']]]]]}}" muted="{{n.attrs.muted}}" bindplay="__e" binderror="__e"></video></block><block wx:else><block wx:if="{{n.name==='audio'}}"><audio class="{{[n.attrs.class]}}" style="{{(n.attrs.style)}}" id="{{n.attrs.id}}" author="{{n.attrs.author}}" controls="{{n.attrs.controls}}" loop="{{n.attrs.loop}}" name="{{n.attrs.name}}" poster="{{n.attrs.poster}}" src="{{n.src[ctrl[i]||0]}}" data-i="{{i}}" data-event-opts="{{[['play',[['play',['$event']]]],['error',[['mediaError',['$event']]]]]}}" bindplay="__e" binderror="__e"></audio></block><block wx:else><block wx:if="{{n.name==='table'&&n.c||n.name==='li'}}"><view class="{{['_'+n.name+' '+n.attrs.class]}}" style="{{(n.attrs.style)}}" id="{{n.attrs.id}}"><block wx:if="{{n.name==='li'}}"><node vue-id="{{'7ee7856b-2-'+i}}" childs="{{n.children}}" opts="{{opts}}" bind:__l="__l"></node></block><block wx:else><block wx:for="{{n.children}}" wx:for-item="tbody" wx:for-index="x" wx:key="x"><view class="{{['_'+tbody.name+' '+tbody.attrs.class]}}" style="{{(tbody.attrs.style)}}"><block wx:if="{{tbody.name==='td'||tbody.name==='th'}}"><node vue-id="{{'7ee7856b-3-'+i+'-'+x}}" childs="{{tbody.children}}" opts="{{opts}}" bind:__l="__l"></node></block><block wx:else><block wx:for="{{tbody.children}}" wx:for-item="tr" wx:for-index="y" wx:key="y"><block><block wx:if="{{tr.name==='td'||tr.name==='th'}}"><view class="{{['_'+tr.name+' '+tr.attrs.class]}}" style="{{(tr.attrs.style)}}"><node vue-id="{{'7ee7856b-4-'+i+'-'+x+'-'+y}}" childs="{{tr.children}}" opts="{{opts}}" bind:__l="__l"></node></view></block><block wx:else><view class="{{['_'+tr.name+' '+tr.attrs.class]}}" style="{{(tr.attrs.style)}}"><block wx:for="{{tr.children}}" wx:for-item="td" wx:for-index="z" wx:key="z"><view class="{{['_'+td.name+' '+td.attrs.class]}}" style="{{(td.attrs.style)}}"><node vue-id="{{'7ee7856b-5-'+i+'-'+x+'-'+y+'-'+z}}" childs="{{td.children}}" opts="{{opts}}" bind:__l="__l"></node></view></block></view></block></block></block></block></view></block></block></view></block><block wx:else><block wx:if="{{!n.c&&!handler.isInline(n.name,n.attrs.style)}}"><rich-text style="{{(n.f)}}" id="{{n.attrs.id}}" user-select="{{opts[4]}}" nodes="{{[n]}}"></rich-text></block><block wx:else><block wx:if="{{n.c===2}}"><view class="{{['_block _'+n.name+' '+n.attrs.class]}}" style="{{(n.f+';'+n.attrs.style)}}" id="{{n.attrs.id}}"><block wx:for="{{n.children}}" wx:for-item="n2" wx:for-index="j" wx:key="j"><node style="{{(n2.f)}}" vue-id="{{'7ee7856b-6-'+i+'-'+j}}" name="{{n2.name}}" attrs="{{n2.attrs}}" childs="{{n2.children}}" opts="{{opts}}" bind:__l="__l"></node></block></view></block><block wx:else><node style="{{(n.f)}}" vue-id="{{'7ee7856b-7-'+i}}" name="{{n.name}}" attrs="{{n.attrs}}" childs="{{n.children}}" opts="{{opts}}" bind:__l="__l"></node></block></block></block></block></block></block></block></block></block></block></block></block></view>
\ No newline at end of file