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 @@
-{{category.category_name}}{{lang=='en-us'?one.$orig.en_category_name:one.$orig.category_name}}{{one.$orig.category_name}}{{two.$orig.category_name}}全部{{''+one.category_name+''}}{{lang=='en-us'?category.en_category_name:category.category_name}}{{item.$orig.label_name}}{{lang=='en-us'?item.$orig.en_goods_name:item.$orig.goods_name}}¥{{item.g5[0]}}{{"."+item.g6[1]}}{{lang=='en-us'?'Make':'咨询'}}{{item.$orig.label_name}}{{item.$orig.goods_name}}¥{{item.g13[0]}}{{"."+item.g14[1]}}{{lang=='en-us'?'Make':'咨询'}}
\ No newline at end of file
+{{category.category_name}}{{lang=='en-us'?one.$orig.en_category_name:one.$orig.category_name}}{{one.$orig.category_name}}{{two.$orig.category_name}}全部{{''+one.category_name+''}}{{lang=='en-us'?category.en_category_name:category.category_name}}{{item.$orig.label_name}}{{lang=='en-us'?item.$orig.en_goods_name:item.$orig.goods_name}}¥{{item.g5[0]}}{{"."+item.g6[1]}}{{lang=='en-us'?'Make':'咨询'}}{{item.$orig.label_name}}{{item.$orig.goods_name}}¥{{item.g13[0]}}{{"."+item.g14[1]}}{{lang=='en-us'?'Make':'咨询'}}
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ 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 @@
-
-
-
-
-
-
-
-
-
-
- {{text}}
-
-
- {{cornerMark>99?'99+':cornerMark}}
-
-
-
-
-
\ No newline at end of file
+{{text}}{{cornerMark>99?'99+':cornerMark}}
\ 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 @@
-用户隐私保护提示感谢您使用本小程序,在使用前您应当阅读并同意{{privacyContractName}},
- 当点击同意并继续时,即表示您已理解并同意该条款内容,该条款将对您产生法律约束力;如您不同意,将无法继续使用小程序相关功能。
\ No newline at end of file
+用户隐私保护提示感谢您使用本小程序,在使用前您应当阅读并同意{{privacyContractName}}, 当点击同意并继续时,即表示您已理解并同意该条款内容,该条款将对您产生法律约束力;如您不同意,将无法继续使用小程序相关功能。
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
- 限时折扣
-
-
- {{"已售"+goodsSkuDetail.sale_num+goodsSkuDetail.unit}}
-
-
-
-
- 距结束仅剩
-
-
-
-
-
-
-
-
-
-
-
- {{$root.m0}}
- {{$root.g0[0]}}
-
- {{"."+$root.g1[1]}}
-
-
-
-
- {{$root.m1}}
- {{$root.g2[0]}}
-
- {{"."+$root.g3[1]}}
-
-
-
-
-
- 原价
-
- {{$root.m2}}
-
- {{goodsSkuDetail.price}}
-
-
-
-
-
- {{$root.m3}}
- {{$root.g5[0]}}
-
- {{"."+$root.g6[1]}}
-
-
-
-
-
-
- {{''+$root.m4+''}}
-
-
-
- {{goodsSkuDetail.price}}
-
-
-
-
- {{goodsSkuDetail.market_price}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{$root.m5}}
-
-
-
-
- {{goodsSkuDetail.goods_name}}
-
-
- {{''+goodsSkuDetail.introduction+''}}
-
-
-
- {{goodsSkuDetail.label_name}}
-
-
-
-
- {{$root.m6+":
- "+(goodsSkuDetail.stock+goodsSkuDetail.unit)}}
-
-
- {{$root.m7+":
- "+(goodsSkuDetail.sale_num+goodsSkuDetail.unit)}}
-
-
-
-
-
-
-
-
-
- {{$root.m8}}
-
-
- {{"One "+$root.m9}}
-
- ¥
- {{$root.g7[0]}}
- {{"."+$root.g8[1]}}
-
-
-
-
-
-
-
- {{$root.m10}}
-
-
- {{item.spec_name+"/"+item.spec_value_name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 组合套餐
- {{bundling[0].bl_name}}
-
-
-
-
-
-
-
-
-
-
-
- {{$root.m11}}
-
- {{goodsSkuDetail.price}}
-
-
-
- {{goodsSkuDetail.goods_name}}
-
-
-
-
-
-
-
-
-
-
- {{item.m12}}
-
- {{item.$orig.price}}
-
-
-
- {{item.$orig.sku_name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+限时折扣{{"已售"+goodsSkuDetail.sale_num+goodsSkuDetail.unit}}距结束仅剩{{$root.m0}}{{$root.g0[0]}}{{"."+$root.g1[1]}}{{$root.m1}}{{$root.g2[0]}}{{"."+$root.g3[1]}}原价{{$root.m2}}{{goodsSkuDetail.price}}{{$root.m3}}{{$root.g5[0]}}{{"."+$root.g6[1]}}{{''+$root.m4+''}}{{goodsSkuDetail.price}}{{goodsSkuDetail.market_price}}{{$root.m5}}{{goodsSkuDetail.goods_name}}{{''+goodsSkuDetail.introduction+''}}{{goodsSkuDetail.label_name}}{{$root.m6+": "+(goodsSkuDetail.stock+goodsSkuDetail.unit)}}{{$root.m7+": "+(goodsSkuDetail.sale_num+goodsSkuDetail.unit)}}{{$root.m8}}{{"One "+$root.m9}}¥{{$root.g7[0]}}{{"."+$root.g8[1]}}{{$root.m10}}{{item.spec_name+"/"+item.spec_value_name}}组合套餐{{bundling[0].bl_name}}{{$root.m11}}{{goodsSkuDetail.price}}{{goodsSkuDetail.goods_name}}{{item.m12}}{{item.$orig.price}}{{item.$orig.sku_name}}
\ 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 @@
-{{''+orderData.order_status_name+''}}{{"("+orderData.promotion_status_name+")"}}{{'预计'+$root.g2+'日后发货'}}{{"订单关闭原因:"+orderData.close_cause}}剩余时间:{{orderData.name+" "+orderData.mobile}}{{"收货地址:"+orderData.full_address+" "+orderData.address}}送达时间:{{orderData.buyer_ask_delivery_time}}配送员:{{orderData.package_list.deliverer}}外卖电话:{{orderData.package_list.deliverer_mobile}}{{orderData.delivery_store_name}}{{'营业时间:'+orderData.delivery_store_info.open_date}}{{"地址:"+orderData.delivery_store_info.full_address}}当前无自提门店姓名预留手机提货时间提货码:{{''+orderData.delivery_code+''}}复制{{goodsItem.$orig.sku_name}}{{''+x.$orig.spec_value_name+"\n\t\t\t\t\t\t\t\t\t"+(i{{$root.m0}}{{goodsItem.g7[0]}}{{"."+goodsItem.g8[1]}}{{''+goodsItem.$orig.num+''}}次卡抵扣{{"-"+goodsItem.m1}}{{goodsItem.g9[0]}}{{"."+goodsItem.g10[1]}}{{item.$orig.value.title+":"}}{{item.$orig.val}}复制{{''+(orderData.order_status==10?'申请售后':'申请退款')+''}}{{orderData.order_status==10?'查看售后':'查看退款'}}订单类型:{{orderData.order_type_name}}订单编号:{{orderData.order_no}}复制订单交易号:{{orderData.out_trade_no}}创建时间:{{$root.g12}}关闭时间:{{$root.g13}}支付方式:{{orderData.pay_type_name}}支付时间:{{$root.g14}}配送方式:{{orderData.delivery_type_name}}买家留言:{{orderData.buyer_message}}活动优惠:{{orderData.promotion_type_name}}发票类型:{{orderData.invoice_type==1?'纸质发票':'电子发票'}}发票抬头类型:{{orderData.invoice_title_type==1?'个人':'企业'}}发票抬头:{{orderData.invoice_title}}发票内容:{{orderData.invoice_content}}发票邮寄地址:{{orderData.invoice_full_address}}发票接收邮件:{{orderData.invoice_email}}{{item.$orig.value.title+":"}}{{item.$orig.val}}复制我的卡包:查看请将条形码或二维码出示给核销员{{orderData.virtual_code}}复制核销信息核销次数{{'剩余'+(orderData.virtual_goods.verify_total_count-orderData.virtual_goods.verify_use_num)+"次/共"+orderData.virtual_goods.verify_total_count+'次'}}有效期{{$root.g18}}永久有效核销记录核销人{{item.$orig.verifier_name}}核销时间{{item.g20}}暂无核销记录卡密信息卡号:{{item.card_info.cardno}}复制密码:{{item.card_info.password}}复制请将条形码或二维码出示给核销员{{orderData.virtual_code}}复制核销信息核销次数{{'剩余'+(orderData.virtual_goods.verify_total_count-orderData.virtual_goods.verify_use_num)+"次/共"+orderData.virtual_goods.verify_total_count+'次'}}有效期{{$root.g23}}永久有效核销记录核销人{{item.$orig.verifier_name}}核销时间{{item.g25}}暂无核销记录商品金额{{$root.m2}}{{''+orderData.goods_money+''}}运费{{$root.m3}}{{orderData.delivery_money}}会员卡{{$root.m4}}{{orderData.member_card_money}}税费{{"("+orderData.invoice_rate+"%)"}}+{{$root.m5}}{{orderData.invoice_money}}发票邮寄费+{{$root.m6}}{{orderData.invoice_delivery_money}}订单调整-+{{$root.m7}}{{$root.f0}}优惠-{{$root.m8}}{{orderData.promotion_money}}优惠券-{{$root.m9}}{{orderData.coupon_money}}使用余额-{{$root.m10}}{{orderData.balance_money}}积分抵扣-{{$root.m11}}{{orderData.point_money}}实付金额:{{$root.m12}}{{orderData.order_money}}评价追评{{''+operationItem.title+''}}评价追评
\ No newline at end of file
+{{''+orderData.order_status_name+''}}{{"("+orderData.promotion_status_name+")"}}{{'预计'+$root.g2+'日后发货'}}{{"订单关闭原因:"+orderData.close_cause}}剩余时间:{{orderData.name+" "+orderData.mobile}}{{"收货地址:"+orderData.full_address+" "+orderData.address}}送达时间:{{orderData.buyer_ask_delivery_time}}配送员:{{orderData.package_list.deliverer}}外卖电话:{{orderData.package_list.deliverer_mobile}}{{orderData.delivery_store_name}}{{'营业时间:'+orderData.delivery_store_info.open_date}}{{"地址:"+orderData.delivery_store_info.full_address}}当前无自提门店姓名预留手机提货时间提货码:{{''+orderData.delivery_code+''}}复制{{goodsItem.$orig.sku_name}}{{''+x.$orig.spec_value_name+"\n\t\t\t\t\t\t\t\t\t"+(i{{$root.m0}}{{goodsItem.g7[0]}}{{"."+goodsItem.g8[1]}}{{''+goodsItem.$orig.num+''}}次卡抵扣{{"-"+goodsItem.m1}}{{goodsItem.g9[0]}}{{"."+goodsItem.g10[1]}}{{item.$orig.value.title+":"}}{{item.$orig.val}}复制{{''+(orderData.order_status==10?'申请售后':'申请退款')+''}}{{orderData.order_status==10?'查看售后':'查看退款'}}订单类型:{{orderData.order_type_name}}订单编号:{{orderData.order_no}}复制订单交易号:{{orderData.out_trade_no}}创建时间:{{$root.g12}}关闭时间:{{$root.g13}}支付方式:{{orderData.pay_type_name}}支付时间:{{$root.g14}}配送方式:{{orderData.delivery_type_name}}买家留言:{{orderData.buyer_message}}活动优惠:{{orderData.promotion_type_name}}发票类型:{{orderData.invoice_type==1?'纸质发票':'电子发票'}}发票抬头类型:{{orderData.invoice_title_type==1?'个人':'企业'}}发票抬头:{{orderData.invoice_title}}发票内容:{{orderData.invoice_content}}发票邮寄地址:{{orderData.invoice_full_address}}发票接收邮件:{{orderData.invoice_email}}{{item.$orig.value.title+":"}}{{item.$orig.val}}复制我的卡包:查看请将条形码或二维码出示给核销员{{orderData.virtual_code}}复制核销信息核销次数{{'剩余'+(orderData.virtual_goods.verify_total_count-orderData.virtual_goods.verify_use_num)+"次/共"+orderData.virtual_goods.verify_total_count+'次'}}有效期{{$root.g18}}永久有效核销记录核销人{{item.$orig.verifier_name}}核销时间{{item.g20}}暂无核销记录卡密信息卡号:{{item.card_info.cardno}}复制密码:{{item.card_info.password}}复制请将条形码或二维码出示给核销员{{orderData.virtual_code}}复制核销信息核销次数{{'剩余'+(orderData.virtual_goods.verify_total_count-orderData.virtual_goods.verify_use_num)+"次/共"+orderData.virtual_goods.verify_total_count+'次'}}有效期{{$root.g23}}永久有效核销记录核销人{{item.$orig.verifier_name}}核销时间{{item.g25}}暂无核销记录商品金额{{$root.m2}}{{''+orderData.goods_money+''}}运费{{$root.m3}}{{orderData.delivery_money}}会员卡{{$root.m4}}{{orderData.member_card_money}}税费{{"("+orderData.invoice_rate+"%)"}}+{{$root.m5}}{{orderData.invoice_money}}发票邮寄费+{{$root.m6}}{{orderData.invoice_delivery_money}}订单调整-+{{$root.m7}}{{$root.f0}}优惠-{{$root.m8}}{{orderData.promotion_money}}优惠券-{{$root.m9}}{{orderData.coupon_money}}使用余额-{{$root.m10}}{{orderData.balance_money}}积分抵扣-{{$root.m11}}{{orderData.point_money}}实付金额:{{$root.m12}}{{orderData.order_money}}评价追评{{''+operationItem.title+''}}评价追评
\ 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 @@
-{{''+packageItem.package_name+''}}{{goodsItem.$orig.sku_name}}{{''+goodsItem.$orig.num+''}}{{"承运公司: "+packageItem.$orig.express_company_name}}运单号:{{packageItem.$orig.delivery_no}}{{traceItem.remark}}{{traceItem.datetime}}{{packageItem.$orig.trace.reason}}{{packageItem.$orig.trace.reason}}
\ No newline at end of file
+{{''+packageItem.package_name+''}}{{goodsItem.$orig.sku_name}}{{''+goodsItem.$orig.num+''}}{{"承运公司: "+packageItem.$orig.express_company_name}}运单号:{{packageItem.$orig.delivery_no}}{{traceItem.remark}}{{traceItem.datetime}}{{packageItem.$orig.trace.reason}}{{packageItem.$orig.trace.reason}}
\ 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 @@
-
-// 行内标签列表
-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
- }
-}
-
-{{n.text}}\n
\ No newline at end of file
+// 行内标签列表 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 } }{{n.text}}\n
\ No newline at end of file