mabaoyi 7 달 전
부모
커밋
55e52151a2
32개의 변경된 파일13개의 추가작업 그리고 13개의 파일을 삭제
  1. 1 1
      pageC/orderForm/component/orderInofrmation.vue
  2. 1 1
      pages/index/index.vue
  3. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  4. 0 0
      unpackage/dist/build/mp-weixin/pageA/payorder.js
  5. 0 0
      unpackage/dist/build/mp-weixin/pageA/payorder.wxml
  6. 1 1
      unpackage/dist/build/mp-weixin/pageA/payorder.wxss
  7. 1 1
      unpackage/dist/build/mp-weixin/pageC/orderForm/component/orderInofrmation.js
  8. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderForm/component/orderInofrmation.wxml
  9. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderForm/component/orderInofrmation.wxss
  10. 0 0
      unpackage/dist/build/mp-weixin/pageD/orderDetail/orderDetail.js
  11. 0 0
      unpackage/dist/build/mp-weixin/pageD/orderDetail/orderDetail.wxml
  12. 0 0
      unpackage/dist/build/mp-weixin/pageD/orderDetail/orderDetail.wxss
  13. 0 0
      unpackage/dist/build/mp-weixin/pageD/orderFormManage/component/detailCard.js
  14. 0 0
      unpackage/dist/build/mp-weixin/pageD/orderFormManage/component/detailCard.wxml
  15. 0 0
      unpackage/dist/build/mp-weixin/pageD/orderFormManage/component/detailCard.wxss
  16. 0 0
      unpackage/dist/build/mp-weixin/pageD/orderFormManage/orderFormManage.js
  17. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.js
  18. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxml
  19. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxss
  20. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/mallOrderForm.json
  21. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json
  22. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json
  23. 2 2
      unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.json
  24. 1 1
      unpackage/dist/build/mp-weixin/project.config.json
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/orderForm/component/orderInofrmation.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  27. 0 0
      unpackage/dist/dev/mp-weixin/pageB/ParcelExpress.wxml
  28. 0 0
      unpackage/dist/dev/mp-weixin/pageB/delivery.wxml
  29. 0 0
      unpackage/dist/dev/mp-weixin/pageB/end.wxml
  30. 0 0
      unpackage/dist/dev/mp-weixin/pageC/orderForm/component/orderInofrmation.wxml
  31. 0 0
      unpackage/dist/dev/mp-weixin/pages/express/express.wxml
  32. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml

+ 1 - 1
pageC/orderForm/component/orderInofrmation.vue

@@ -135,7 +135,7 @@
       <button
         class="status-2"
         v-if="itemInfo.order.simplify_status == 'finished'"
-        @click="$emit('toDetail', itemInfo)"
+        @click.stop="$emit('toDetail', itemInfo)"
       >
         去评价
       </button>

+ 1 - 1
pages/index/index.vue

@@ -182,7 +182,7 @@
 			<view class="u-flex u-row-between" style="flex-wrap: wrap;">
 				<view class="bigbox" v-for="(item,index) in recomlist" style="position: relative;"
 					@click="todetail(item.id)">
-					<view class="discount">
+					<view v-if="item.is_discount==0 || item.mer_is_discount ==0 " class="discount">
 						{{i18n.discount}}
 					</view>
 					<image :src="item.image"

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/payorder.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/payorder.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pageA/payorder.wxss

@@ -1 +1 @@
-.payment.data-v-c8f3fb3c{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-c8f3fb3c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-c8f3fb3c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-c8f3fb3c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-c8f3fb3c{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-c8f3fb3c{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-c8f3fb3c{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-c8f3fb3c{position:relative}.back .topbox .state.data-v-c8f3fb3c{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-c8f3fb3c{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-c8f3fb3c{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}
+.payment.data-v-bfee3f78{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.content.data-v-bfee3f78{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#777;line-height:28rpx;text-align:left;font-style:normal}.stateac.data-v-bfee3f78{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#ff1515;line-height:34rpx;text-align:left;font-style:normal}.unstate.data-v-bfee3f78{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#222;line-height:34rpx;text-align:left;font-style:normal}.confirm.data-v-bfee3f78{position:fixed;bottom:66rpx;width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.payitem.data-v-bfee3f78{width:702rpx;height:140rpx;background:#fff;border-radius:12rpx;padding:34rpx 24rpx;box-sizing:border-box}.back.data-v-bfee3f78{padding:20rpx 24rpx;box-sizing:border-box}.back .topbox.data-v-bfee3f78{position:relative}.back .topbox .state.data-v-bfee3f78{background:#fff;border-radius:6rpx;padding:12rpx;box-sizing:border-box}.back .topbox .paysum.data-v-bfee3f78{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.back .topbox .numbe.data-v-bfee3f78{font-family:HarmonyOS_Sans_Medium;font-size:28rpx;color:#000;line-height:38rpx;text-align:left;font-style:normal;margin-top:20rpx}

+ 1 - 1
unpackage/dist/build/mp-weixin/pageC/orderForm/component/orderInofrmation.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/orderInofrmation"],{"2c7c":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=function(){e.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(e("ac58"))}.bind(null,e)).catch(e.oe)},r={components:{textRight:o},props:{itemInfo:{typeof:Object,default:{}}},computed:{},data:function(){return{show:!1}},watch:{itemInfo:function(n){}},methods:{more:function(){this.show=!this.show}}};t.default=r},"65b9":function(n,t,e){"use strict";var o=e("a184"),r=e.n(o);r.a},"9b65":function(n,t,e){"use strict";e.r(t);var o=e("2c7c"),r=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(i);t["default"]=r.a},a184:function(n,t,e){},b4ed:function(n,t,e){"use strict";e.r(t);var o=e("c0a56"),r=e("9b65");for(var i in r)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(i);e("65b9");var u,c=e("f0c5"),a=Object(c["a"])(r["default"],o["b"],o["c"],!1,null,"013d281c",null,!1,o["a"],u);t["default"]=a.exports},c0a56:function(n,t,e){"use strict";e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return o}));var o={uTransition:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-transition/u-transition")]).then(e.bind(null,"c714"))}},r=function(){var n=this,t=n.$createElement,e=(n._self._c,n.itemInfo.order?n.__map(n.itemInfo.order_goods,(function(t,e){var o=n.__get_orig(t),r=t.sku_item?t.discount_price.split("."):null,i=t.sku_item?t.discount_price.split("."):null;return{$orig:o,g0:r,g1:i}})):null),o=n.itemInfo.order?n.itemInfo.order.amount.split("."):null,r=n.itemInfo.order?n.itemInfo.order.amount.split("."):null;n.$mp.data=Object.assign({},{$root:{l0:e,g2:o,g3:r}})},i=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/orderForm/component/orderInofrmation"],{"0b33":function(n,t,e){"use strict";var o=e("54cd"),r=e.n(o);r.a},"2c7c":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=function(){e.e("pageC/accountSecurity/component/textRight").then(function(){return resolve(e("ac58"))}.bind(null,e)).catch(e.oe)},r={components:{textRight:o},props:{itemInfo:{typeof:Object,default:{}}},computed:{},data:function(){return{show:!1}},watch:{itemInfo:function(n){}},methods:{more:function(){this.show=!this.show}}};t.default=r},"54cd":function(n,t,e){},"9b65":function(n,t,e){"use strict";e.r(t);var o=e("2c7c"),r=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(i);t["default"]=r.a},b4ed:function(n,t,e){"use strict";e.r(t);var o=e("e148"),r=e("9b65");for(var i in r)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(i);e("0b33");var u,c=e("f0c5"),a=Object(c["a"])(r["default"],o["b"],o["c"],!1,null,"57acfd12",null,!1,o["a"],u);t["default"]=a.exports},e148:function(n,t,e){"use strict";e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return o}));var o={uTransition:function(){return Promise.all([e.e("common/vendor"),e.e("uview-ui/components/u-transition/u-transition")]).then(e.bind(null,"c714"))}},r=function(){var n=this,t=n.$createElement,e=(n._self._c,n.itemInfo.order?n.__map(n.itemInfo.order_goods,(function(t,e){var o=n.__get_orig(t),r=t.sku_item?t.discount_price.split("."):null,i=t.sku_item?t.discount_price.split("."):null;return{$orig:o,g0:r,g1:i}})):null),o=n.itemInfo.order?n.itemInfo.order.amount.split("."):null,r=n.itemInfo.order?n.itemInfo.order.amount.split("."):null;n.$mp.data=Object.assign({},{$root:{l0:e,g2:o,g3:r}})},i=[]}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/orderForm/component/orderInofrmation-create-component',
     {

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderForm/component/orderInofrmation.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderForm/component/orderInofrmation.wxss


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/orderDetail/orderDetail.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/orderDetail/orderDetail.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/orderDetail/orderDetail.wxss


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/orderFormManage/component/detailCard.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/orderFormManage/component/detailCard.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/orderFormManage/component/detailCard.wxss


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/orderFormManage/orderFormManage.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxss


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

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

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

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

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

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

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

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

+ 1 - 1
unpackage/dist/build/mp-weixin/project.config.json

@@ -8,7 +8,7 @@
     "urlCheck": false,
     "es6": false,
     "postcss": false,
-    "minified": true,
+    "minified": false,
     "newFeature": true,
     "bigPackageSizeSupport": true,
     "babelSetting": {

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/orderForm/component/orderInofrmation.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/ParcelExpress.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/delivery.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageB/end.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/dev/mp-weixin/pageC/orderForm/component/orderInofrmation.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/express/express.wxml


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.