xiaoe_mp_npm 0.5.44-test9 → 0.5.45-test1

package/.gitlab-ci.yml

@@ -1,45 +1,45 @@
-# 发布测试包
-build_test:
-  stage: build
-  only:
-    - dev
-    - bug-hotfix/replace-url
-    - feature/live_marketing_iteration
-    - feature/remove-error-report
-    - fix/record-lottery
-    - feature/coupon_fix
-  tags:
-    - fe-group-prod-runner-2
-  script:
-    - export project_name=$(cat package.json|awk -F "[:]" '/"name"/{print$2}')
-    - export project_name=${project_name:2:$[${#project_name}-4]}
-    - export version=`cat package.json|awk -F "[:]" '/"version"/{print$2}'`
-    - export version=${version:2:$[${#version}-4]}
-    - export message=$(git log --pretty=format:%s -1)
-    - export author=$(git log --pretty=format:%an -1)
-    - cnpm i
-    - npm run build
-    - cnpm publish
-
-# 发布正式包
-build_master:
-  stage: build
-  only:
-    - master
-    - /^release\/.*$/
-  tags:
-    - fe-group-prod-runner-2
-  script:
-    - export project_name=$(cat package.json|awk -F "[:]" '/"name"/{print$2}')
-    - export project_name=${project_name:2:$[${#project_name}-4]}
-    - export version=`cat package.json|awk -F "[:]" '/"version"/{print$2}'`
-    - export version=${version:2:$[${#version}-4]}
-    - export message=$(git log --no-merges --pretty=format:%s -1)
-    - export author=$(git log --no-merges --pretty=format:%an -1)
-    - cnpm i
-    - npm run build
-    - cnpm publish
-    - curl 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=0ae9c0e9-3e15-49cf-9493-8f880943c6f0' -H 'Content-Type:application/json' -d '{"msgtype":"text","text":{"content":"'${project_name}'发包成功，版本号：'${version}'，提交人：'${author}'，提交信息：'${message}'"}}'
-
-
-
+# 发布测试包
+build_test:
+  stage: build
+  only:
+    - dev
+    - bug-hotfix/replace-url
+    - feature/live_marketing_iteration
+    - feature/remove-error-report
+    - fix/record-lottery
+    - feature/coupon_fix
+  tags:
+    - fe-group-prod-runner-2
+  script:
+    - export project_name=$(cat package.json|awk -F "[:]" '/"name"/{print$2}')
+    - export project_name=${project_name:2:$[${#project_name}-4]}
+    - export version=`cat package.json|awk -F "[:]" '/"version"/{print$2}'`
+    - export version=${version:2:$[${#version}-4]}
+    - export message=$(git log --pretty=format:%s -1)
+    - export author=$(git log --pretty=format:%an -1)
+    - cnpm i
+    - npm run build
+    - cnpm publish
+
+# 发布正式包
+build_master:
+  stage: build
+  only:
+    - master
+    - /^release\/.*$/
+  tags:
+    - fe-group-prod-runner-2
+  script:
+    - export project_name=$(cat package.json|awk -F "[:]" '/"name"/{print$2}')
+    - export project_name=${project_name:2:$[${#project_name}-4]}
+    - export version=`cat package.json|awk -F "[:]" '/"version"/{print$2}'`
+    - export version=${version:2:$[${#version}-4]}
+    - export message=$(git log --no-merges --pretty=format:%s -1)
+    - export author=$(git log --no-merges --pretty=format:%an -1)
+    - cnpm i
+    - npm run build
+    - cnpm publish
+    - curl 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=0ae9c0e9-3e15-49cf-9493-8f880943c6f0' -H 'Content-Type:application/json' -d '{"msgtype":"text","text":{"content":"'${project_name}'发包成功，版本号：'${version}'，提交人：'${author}'，提交信息：'${message}'"}}'
+
+
+

package/miniprogram_dist/ConfirmOrder/components/ConfirmOrderContent/index.js

@@ -487,7 +487,6 @@ Component({
      * @param {Boolean} data.triggerPrePay  本次修改是否触发批价
      */
     payInfoChange(val) {
-      console.log('子组件传参父组件',val)
       let data = {};
       val.detail ? data = val.detail : data = val
       this.setData({
@@ -542,8 +541,6 @@ Component({
           })
         }
       }
-      console.log('prePayParams',this.data.prePayParams);
-      console.log('payParams',this.data.payParams);
     },
     // 返回箭头点击事件
     backClick() {

package/miniprogram_dist/ConfirmOrder/components/ConfirmOrderContent/index.scss

@@ -1,45 +1,45 @@
-$deviceWidth: 750;
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@mixin confirm-order-content {
-    height: 100%;
-  
-    .confirm-main {
-      padding-bottom: vmin(150);
-      background: #f5f5f5;
-  
-      .coupon-integral-wrapper {
-        margin-bottom: vmin(16);
-      }
-    }
-}
-
-.confirm-order-content {
-    @include confirm-order-content;
-}
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-    $deviceWidth: 1536 !global;
-
-    .confirm-order-content {
-        @include confirm-order-content;
-    }
-}
-// PC 放大适配
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  $deviceWidth: 1260 !global;
-
-  .confirm-order-content {
-    @include confirm-order-content;
-  }
-}
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-    $deviceWidth: 1536 !global;
-
-    .confirm-order-content {
-        @include confirm-order-content;
-    }
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin confirm-order-content {
+    height: 100%;
+  
+    .confirm-main {
+      padding-bottom: vmin(150);
+      background: #f5f5f5;
+  
+      .coupon-integral-wrapper {
+        margin-bottom: vmin(16);
+      }
+    }
+}
+
+.confirm-order-content {
+    @include confirm-order-content;
+}
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+    $deviceWidth: 1536 !global;
+
+    .confirm-order-content {
+        @include confirm-order-content;
+    }
+}
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .confirm-order-content {
+    @include confirm-order-content;
+  }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+    $deviceWidth: 1536 !global;
+
+    .confirm-order-content {
+        @include confirm-order-content;
+    }
 }

package/miniprogram_dist/ConfirmOrder/components/ConfirmOrderContent/index.wxml

@@ -49,7 +49,6 @@
     ></ChoosePicker>
     <!-- 商品信息 -->
     <GoodsInfo
-      prePayInfo="{{prePayInfo}}"
       marketingData="{{ marketingData.marketing_info }}"
       goodsInfo="{{ goodsInfo }}"
       confirmOrderInfo="{{ confirmOrderInfo }}"