zhaogongxue 5 місяців тому
батько
коміт
65946a3c03

+ 2 - 2
pageA/order.vue

@@ -203,13 +203,13 @@
 				<!-- <view class="money" v-else>{{Number(sku_info.weight)*value}}kg</view> -->
 				<view class="money">{{ weight_total }}</view>
 			</view>
-			<view class="back u-flex" v-if="containname1">
+<!-- 			<view class="back u-flex" v-if="containname1">
 				<image src="static/images/warning.png" style="width: 32rpx; height: 32rpx" mode=""></image>
 				<text
 					style="margin-left: 12rpx; font-size: 24rpx">{{ i18n.buy }}{{ recommend_weight }}kg{{ i18n.price }}¥{{
             unit_fee
           }},{{ i18n.morefavorable }}</text>
-			</view>
+			</view> -->
 			<view class="u-flex u-row-between" style="margin-bottom: 40rpx; margin-top: 20rpx">
 				<view class="name">{{ i18n.Costperkilogram }}</view>
 				<view class="money">{{

+ 3 - 3
pageD/newBulitOrder/component/goodsInformation.vue

@@ -10,7 +10,7 @@
         <view class="name">{{ i18n.Grosscommodityweight }}</view>
         <view class="money">{{ goodsWeight }}kg</view>
       </view>
-      <view class="back u-flex" v-if="containname">
+<!--      <view class="back u-flex" v-if="containname">
         <image
           src="../../../static/images/warning.png"
           style="width: 32rpx; height: 32rpx"
@@ -23,7 +23,7 @@
             i18n.morefavorable
           }}</text
         >
-      </view>
+      </view> -->
       <view
         class="u-flex u-row-between"
         style="margin-bottom: 40rpx; margin-top: 20rpx"
@@ -36,7 +36,7 @@
       <view class="u-flex u-row-between">
         <view class="name">{{ i18n.freight }}</view>
         <!-- 基础运费乘以公斤数,得出订单运费,最外层Number().toFixed(2)的作用,保留小数点后两位 -->
-        <view class="money">{{
+        <view class="money">{{  
           containname
             ? Number(countGoodsInformation.sum).toFixed(2)
             : i18n.shippingmethod

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-index/kj-index.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-index/kj-index.wxml


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
unpackage/dist/build/mp-weixin/components/kj-index/kj-index.wxss


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.wxml


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.wxss


+ 1 - 1
unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/goodsInformation.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/goodsInformation"],{"0664":function(t,n,e){"use strict";e.r(n);var o=e("b30c"),u=e("a76f");for(var a in u)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(a);e("a5b7");var f,r=e("f0c5"),i=Object(r["a"])(u["default"],o["b"],o["c"],!1,null,"0e4843a6",null,!1,o["a"],f);n["default"]=i.exports},"67aa":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{goodinfo:{typeof:Object,default:function(){return{}}},sku_info:{typeof:Object,default:function(){return{}}},containname:{typeof:String,default:""},goodsPrice:{typeof:String,default:""},countGoodsInformation:{typeof:Object,default:function(){return{}}},goodsValue:{typeof:Number,default:0},goodsWeight:{typeof:Number,default:0},specificationsPrice:{typeof:Number,default:0}},computed:{i18n:function(){return this.$t("index")}}};n.default=o},a5b7:function(t,n,e){"use strict";var o=e("dc9b"),u=e.n(o);u.a},a76f:function(t,n,e){"use strict";e.r(n);var o=e("67aa"),u=e.n(o);for(var a in o)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(a);n["default"]=u.a},b30c:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return o}));var u=function(){var t=this,n=t.$createElement,e=(t._self._c,t.containname?Number(t.countGoodsInformation.sum).toFixed(2):null);t.$mp.data=Object.assign({},{$root:{g0:e}})},a=[]},dc9b:function(t,n,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/newBulitOrder/component/goodsInformation"],{"0664":function(t,n,e){"use strict";e.r(n);var o=e("f05ad"),u=e("a76f");for(var f in u)["default"].indexOf(f)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(f);e("64dd");var a,r=e("f0c5"),i=Object(r["a"])(u["default"],o["b"],o["c"],!1,null,"ef072f6c",null,!1,o["a"],a);n["default"]=i.exports},5853:function(t,n,e){},"64dd":function(t,n,e){"use strict";var o=e("5853"),u=e.n(o);u.a},"67aa":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{goodinfo:{typeof:Object,default:function(){return{}}},sku_info:{typeof:Object,default:function(){return{}}},containname:{typeof:String,default:""},goodsPrice:{typeof:String,default:""},countGoodsInformation:{typeof:Object,default:function(){return{}}},goodsValue:{typeof:Number,default:0},goodsWeight:{typeof:Number,default:0},specificationsPrice:{typeof:Number,default:0}},computed:{i18n:function(){return this.$t("index")}}};n.default=o},a76f:function(t,n,e){"use strict";e.r(n);var o=e("67aa"),u=e.n(o);for(var f in o)["default"].indexOf(f)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(f);n["default"]=u.a},f05ad:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return f})),e.d(n,"a",(function(){return o}));var u=function(){var t=this,n=t.$createElement,e=(t._self._c,t.containname?Number(t.countGoodsInformation.sum).toFixed(2):null);t.$mp.data=Object.assign({},{$root:{g0:e}})},f=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/newBulitOrder/component/goodsInformation-create-component',
     {

+ 1 - 1
unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/goodsInformation.wxml

@@ -1 +1 @@
-<view class="list data-v-0e4843a6"><view class="abount data-v-0e4843a6" style="margin-top:20rpx;"><view class="u-flex u-row-between data-v-0e4843a6" style="margin-bottom:40rpx;"><view class="name data-v-0e4843a6">{{i18n.Commodityamount}}</view><view class="money data-v-0e4843a6">{{'¥'+specificationsPrice+''}}</view></view><block wx:if="{{containname}}"><view class="u-flex u-row-between data-v-0e4843a6"><view class="name data-v-0e4843a6">{{i18n.Grosscommodityweight}}</view><view class="money data-v-0e4843a6">{{goodsWeight+"kg"}}</view></view></block><block wx:if="{{containname}}"><view class="back u-flex data-v-0e4843a6"><image style="width:32rpx;height:32rpx;" src="../../../static/images/warning.png" mode class="data-v-0e4843a6"></image><text style="margin-left:12rpx;font-size:24rpx;" class="data-v-0e4843a6">{{i18n.buy+countGoodsInformation.max_weight+"kg"+i18n.price+"¥"+countGoodsInformation.unit_fee+","+i18n.morefavorable}}</text></view></block><view class="u-flex u-row-between data-v-0e4843a6" style="margin-bottom:40rpx;margin-top:20rpx;"><view class="name data-v-0e4843a6">{{i18n.Costperkilogram}}</view><view class="money data-v-0e4843a6">{{containname?countGoodsInformation.unit_price:i18n.shippingmethod}}</view></view><view class="u-flex u-row-between data-v-0e4843a6"><view class="name data-v-0e4843a6">{{i18n.freight}}</view><view class="money data-v-0e4843a6">{{containname?$root.g0:i18n.shippingmethod}}</view></view><block wx:if="{{false}}"><view class="zong u-flex u-row-right data-v-0e4843a6"><view class="data-v-0e4843a6"><text class="small data-v-0e4843a6">{{i18n.subtotal}}</text><text class="mon data-v-0e4843a6">¥</text><text class="mon data-v-0e4843a6" style="font-size:40rpx;">{{specificationsPrice}}</text></view></view></block></view></view>
+<view class="list data-v-ef072f6c"><view class="abount data-v-ef072f6c" style="margin-top:20rpx;"><view class="u-flex u-row-between data-v-ef072f6c" style="margin-bottom:40rpx;"><view class="name data-v-ef072f6c">{{i18n.Commodityamount}}</view><view class="money data-v-ef072f6c">{{'¥'+specificationsPrice+''}}</view></view><block wx:if="{{containname}}"><view class="u-flex u-row-between data-v-ef072f6c"><view class="name data-v-ef072f6c">{{i18n.Grosscommodityweight}}</view><view class="money data-v-ef072f6c">{{goodsWeight+"kg"}}</view></view></block><view class="u-flex u-row-between data-v-ef072f6c" style="margin-bottom:40rpx;margin-top:20rpx;"><view class="name data-v-ef072f6c">{{i18n.Costperkilogram}}</view><view class="money data-v-ef072f6c">{{containname?countGoodsInformation.unit_price:i18n.shippingmethod}}</view></view><view class="u-flex u-row-between data-v-ef072f6c"><view class="name data-v-ef072f6c">{{i18n.freight}}</view><view class="money data-v-ef072f6c">{{containname?$root.g0:i18n.shippingmethod}}</view></view><block wx:if="{{false}}"><view class="zong u-flex u-row-right data-v-ef072f6c"><view class="data-v-ef072f6c"><text class="small data-v-ef072f6c">{{i18n.subtotal}}</text><text class="mon data-v-ef072f6c">¥</text><text class="mon data-v-ef072f6c" style="font-size:40rpx;">{{specificationsPrice}}</text></view></view></block></view></view>

+ 1 - 1
unpackage/dist/build/mp-weixin/pageD/newBulitOrder/component/goodsInformation.wxss

@@ -1 +1 @@
-.list .abount.data-v-0e4843a6{padding:28rpx 24rpx;box-sizing:border-box;background:#fff;border-radius:16rpx;width:702rpx}.list .abount .zong.data-v-0e4843a6{width:654rpx;padding:22rpx 0 0 0;border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:32rpx}.list .abount .zong .small.data-v-0e4843a6{font-family:PingFangTC;font-weight:400;font-size:24rpx;color:#444;line-height:34rpx;text-align:left;font-style:normal}.list .abount .zong .mon.data-v-0e4843a6{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;margin-left:12rpx;font-weight:700}.list .abount .back.data-v-0e4843a6{background:#f4f4f4;padding:22rpx 16rpx;box-sizing:border-box;margin-top:10rpx}.list .abount .name.data-v-0e4843a6{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#333;line-height:40rpx;text-align:left;font-style:normal}.list .abount .money.data-v-0e4843a6{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#222;line-height:38rpx;text-align:left;font-style:normal;font-weight:600}
+.list .abount.data-v-ef072f6c{padding:28rpx 24rpx;box-sizing:border-box;background:#fff;border-radius:16rpx;width:702rpx}.list .abount .zong.data-v-ef072f6c{width:654rpx;padding:22rpx 0 0 0;border-top:2rpx solid hsla(0,0%,59.2%,.1);margin-top:32rpx}.list .abount .zong .small.data-v-ef072f6c{font-family:PingFangTC;font-weight:400;font-size:24rpx;color:#444;line-height:34rpx;text-align:left;font-style:normal}.list .abount .zong .mon.data-v-ef072f6c{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#f83224;line-height:38rpx;text-align:left;font-style:normal;margin-left:12rpx;font-weight:700}.list .abount .back.data-v-ef072f6c{background:#f4f4f4;padding:22rpx 16rpx;box-sizing:border-box;margin-top:10rpx}.list .abount .name.data-v-ef072f6c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#333;line-height:40rpx;text-align:left;font-style:normal}.list .abount .money.data-v-ef072f6c{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#222;line-height:38rpx;text-align:left;font-style:normal;font-weight:600}

+ 2 - 2
unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
unpackage/dist/build/mp-weixin/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }

+ 2 - 2
unpackage/dist/build/mp-weixin/uview-ui/components/u-swipe-action/u-swipe-action.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/order.js.map


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageD/newBulitOrder/component/goodsInformation.js.map


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageA/order.wxml


+ 1 - 1
unpackage/dist/dev/mp-weixin/pageD/newBulitOrder/component/goodsInformation.wxml

@@ -1 +1 @@
-<view class="list data-v-02a158b5"><view class="abount data-v-02a158b5" style="margin-top:20rpx;"><view class="u-flex u-row-between data-v-02a158b5" style="margin-bottom:40rpx;"><view class="name data-v-02a158b5">{{i18n.Commodityamount}}</view><view class="money data-v-02a158b5">{{'¥'+specificationsPrice+''}}</view></view><block wx:if="{{containname}}"><view class="u-flex u-row-between data-v-02a158b5"><view class="name data-v-02a158b5">{{i18n.Grosscommodityweight}}</view><view class="money data-v-02a158b5">{{goodsWeight+"kg"}}</view></view></block><block wx:if="{{containname}}"><view class="back u-flex data-v-02a158b5"><image style="width:32rpx;height:32rpx;" src="../../../static/images/warning.png" mode class="data-v-02a158b5"></image><text style="margin-left:12rpx;font-size:24rpx;" class="data-v-02a158b5">{{i18n.buy+countGoodsInformation.max_weight+"kg"+i18n.price+"¥"+countGoodsInformation.unit_fee+","+i18n.morefavorable}}</text></view></block><view class="u-flex u-row-between data-v-02a158b5" style="margin-bottom:40rpx;margin-top:20rpx;"><view class="name data-v-02a158b5">{{i18n.Costperkilogram}}</view><view class="money data-v-02a158b5">{{containname?countGoodsInformation.unit_price:i18n.shippingmethod}}</view></view><view class="u-flex u-row-between data-v-02a158b5"><view class="name data-v-02a158b5">{{i18n.freight}}</view><view class="money data-v-02a158b5">{{containname?$root.g0:i18n.shippingmethod}}</view></view><block wx:if="{{false}}"><view class="zong u-flex u-row-right data-v-02a158b5"><view class="data-v-02a158b5"><text class="small data-v-02a158b5">{{i18n.subtotal}}</text><text class="mon data-v-02a158b5">¥</text><text class="mon data-v-02a158b5" style="font-size:40rpx;">{{specificationsPrice}}</text></view></view></block></view></view>
+<view class="list data-v-02a158b5"><view class="abount data-v-02a158b5" style="margin-top:20rpx;"><view class="u-flex u-row-between data-v-02a158b5" style="margin-bottom:40rpx;"><view class="name data-v-02a158b5">{{i18n.Commodityamount}}</view><view class="money data-v-02a158b5">{{'¥'+specificationsPrice+''}}</view></view><block wx:if="{{containname}}"><view class="u-flex u-row-between data-v-02a158b5"><view class="name data-v-02a158b5">{{i18n.Grosscommodityweight}}</view><view class="money data-v-02a158b5">{{goodsWeight+"kg"}}</view></view></block><view class="u-flex u-row-between data-v-02a158b5" style="margin-bottom:40rpx;margin-top:20rpx;"><view class="name data-v-02a158b5">{{i18n.Costperkilogram}}</view><view class="money data-v-02a158b5">{{containname?countGoodsInformation.unit_price:i18n.shippingmethod}}</view></view><view class="u-flex u-row-between data-v-02a158b5"><view class="name data-v-02a158b5">{{i18n.freight}}</view><view class="money data-v-02a158b5">{{containname?$root.g0:i18n.shippingmethod}}</view></view><block wx:if="{{false}}"><view class="zong u-flex u-row-right data-v-02a158b5"><view class="data-v-02a158b5"><text class="small data-v-02a158b5">{{i18n.subtotal}}</text><text class="mon data-v-02a158b5">¥</text><text class="mon data-v-02a158b5" style="font-size:40rpx;">{{specificationsPrice}}</text></view></view></block></view></view>

Деякі файли не було показано, через те що забагато файлів було змінено