xiaoe_mp_npm 1.0.14-test01 → 1.0.14

package/.gitlab-ci.yml

@@ -1,44 +1,44 @@
-# 发布测试包
-build_test:
-  stage: build
-  only:
-    - dev
-    - bug-hotfix/replace-url
-    - feature/live_marketing_iteration
-    - feature/remove-error-report
-    - fix/record-lottery
-  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
+  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/AddressSelect/index.js

@@ -1,161 +1,161 @@
-// src/ConfirmOrder/components/AddressSelect/index.js
-const computedBehavior = require('miniprogram-computed').behavior
-import {
-  ENTITY_GOODS,COP_GOODS
-} from '../../../common/utils/constants';
-import {
-  isEmptyObject
-} from "../../../common/utils/index"
-
-Component({
-  behaviors: [computedBehavior],
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    addressInfo: {
-      type: Object,
-      value: () => {},
-      observer(address) {
-        this.triggerEvent("dataChange", {
-          name: 'address',
-          prePayParams: {
-            address_id: address && address.id,
-          },
-          errMsg: this.data.showAddressSelect && !this.data.haveAddress && '请添加收货地址',
-          triggerPrePay: !!(!this.data.isCart && address && address.id),
-        })
-        if (this.data.isCart) {
-          this.triggerEvent("updataData", {
-            cartInfoLoaded: false
-          })
-        }
-        if (!this.data.addressInfoLoaded) {
-          this.triggerEvent("updataData", {
-            addressInfoLoaded: true
-          })
-        }
-      }
-    },
-    isCart: {
-      type: Number,
-      value: 0,
-    },
-    activeMode: {
-      type: Number,
-      value: 0,
-    },
-    baseInfoQuery: {
-      type: Object,
-      value: () => {},
-    },
-    hasEntityGoods: {
-      type: Boolean,
-      value: false,
-    },
-    cartGoodsList: {
-      type: Array,
-      value: () => [],
-    },
-    goodsInfo: {
-      type: Object,
-      value: () => {},
-    },
-    isShowAddressManage: {
-      type: Boolean,
-      value: false,
-    },
-    addressQuery: {
-      type: Object,
-      value: () => {},
-    },
-    cartInfoLoaded: {
-      type: Boolean,
-      value: false,
-    },
-    addressInfoLoaded: {
-      type: Boolean,
-      value: false,
-    }
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  lifetimes: {
-    attached: async function () {
-      this.triggerEvent("dataChange", {
-        name: 'address',
-        errMsg: this.data.showAddressSelect &&
-          !this.data.haveAddress &&
-          this.data.activeMode === 0 &&
-          '请添加收货地址',
-      })
-    },
-  },
-  computed: {
-    showAddressSelect(data) {
-      return (
-        data.baseInfoQuery.spu_type === ENTITY_GOODS ||
-        data.baseInfoQuery.spu_type === COP_GOODS ||
-        (data.goodsInfo.is_goods_package && data.hasEntityGoods) ||
-        (data.isCart &&
-          data.cartGoodsList.some((goodsInfo) => {
-            return (
-              goodsInfo.spu_type === ENTITY_GOODS ||
-              goodsInfo.entity_goods_num > 0
-            );
-          }))
-      );
-    },
-    haveAddress(data) {
-      return data.addressInfo && !isEmptyObject(data.addressInfo);
-    },
-    invalidAddress(data) {
-      return data.addressInfo && !data.addressInfo.calculate_freight;
-    },
-    needAddress(data) {
-      return !data.haveAddress && data.showAddressSelect;
-    },
-  },
-  observers: {
-    needAddress(val) {
-      if (val) {
-        this.triggerEvent("dataChange", {
-          name: 'address',
-          errMsg: '请添加收货地址'
-        })
-      }
-    }
-  },
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    // 修改地址
-    changeAddress() {
-      let obj = {}
-      if (this.data.haveAddress) {
-        obj = {
-          isShowAddressManage: true,
-          addressQuery: {
-            selectable: true,
-            id: this.data.addressInfo.id,
-            orderdata: this.data.baseInfoQuery,
-          }
-        }
-      } else {
-        obj = {
-          isShowEditAddress: true,
-          addressQuery: {}
-        }
-      }
-      this.triggerEvent("updataData", obj)
-      this.setData(obj)
-    }
-  }
+// src/ConfirmOrder/components/AddressSelect/index.js
+const computedBehavior = require('miniprogram-computed').behavior
+import {
+  ENTITY_GOODS,COP_GOODS
+} from '../../../common/utils/constants';
+import {
+  isEmptyObject
+} from "../../../common/utils/index"
+
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    addressInfo: {
+      type: Object,
+      value: () => {},
+      observer(address) {
+        this.triggerEvent("dataChange", {
+          name: 'address',
+          prePayParams: {
+            address_id: address && address.id,
+          },
+          errMsg: this.data.showAddressSelect && !this.data.haveAddress && '请添加收货地址',
+          triggerPrePay: !!(!this.data.isCart && address && address.id),
+        })
+        if (this.data.isCart) {
+          this.triggerEvent("updataData", {
+            cartInfoLoaded: false
+          })
+        }
+        if (!this.data.addressInfoLoaded) {
+          this.triggerEvent("updataData", {
+            addressInfoLoaded: true
+          })
+        }
+      }
+    },
+    isCart: {
+      type: Number,
+      value: 0,
+    },
+    activeMode: {
+      type: Number,
+      value: 0,
+    },
+    baseInfoQuery: {
+      type: Object,
+      value: () => {},
+    },
+    hasEntityGoods: {
+      type: Boolean,
+      value: false,
+    },
+    cartGoodsList: {
+      type: Array,
+      value: () => [],
+    },
+    goodsInfo: {
+      type: Object,
+      value: () => {},
+    },
+    isShowAddressManage: {
+      type: Boolean,
+      value: false,
+    },
+    addressQuery: {
+      type: Object,
+      value: () => {},
+    },
+    cartInfoLoaded: {
+      type: Boolean,
+      value: false,
+    },
+    addressInfoLoaded: {
+      type: Boolean,
+      value: false,
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  lifetimes: {
+    attached: async function () {
+      this.triggerEvent("dataChange", {
+        name: 'address',
+        errMsg: this.data.showAddressSelect &&
+          !this.data.haveAddress &&
+          this.data.activeMode === 0 &&
+          '请添加收货地址',
+      })
+    },
+  },
+  computed: {
+    showAddressSelect(data) {
+      return (
+        data.baseInfoQuery.spu_type === ENTITY_GOODS ||
+        data.baseInfoQuery.spu_type === COP_GOODS ||
+        (data.goodsInfo.is_goods_package && data.hasEntityGoods) ||
+        (data.isCart &&
+          data.cartGoodsList.some((goodsInfo) => {
+            return (
+              goodsInfo.spu_type === ENTITY_GOODS ||
+              goodsInfo.entity_goods_num > 0
+            );
+          }))
+      );
+    },
+    haveAddress(data) {
+      return data.addressInfo && !isEmptyObject(data.addressInfo);
+    },
+    invalidAddress(data) {
+      return data.addressInfo && !data.addressInfo.calculate_freight;
+    },
+    needAddress(data) {
+      return !data.haveAddress && data.showAddressSelect;
+    },
+  },
+  observers: {
+    needAddress(val) {
+      if (val) {
+        this.triggerEvent("dataChange", {
+          name: 'address',
+          errMsg: '请添加收货地址'
+        })
+      }
+    }
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 修改地址
+    changeAddress() {
+      let obj = {}
+      if (this.data.haveAddress) {
+        obj = {
+          isShowAddressManage: true,
+          addressQuery: {
+            selectable: true,
+            id: this.data.addressInfo.id,
+            orderdata: this.data.baseInfoQuery,
+          }
+        }
+      } else {
+        obj = {
+          isShowEditAddress: true,
+          addressQuery: {}
+        }
+      }
+      this.triggerEvent("updataData", obj)
+      this.setData(obj)
+    }
+  }
 })

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

@@ -1,116 +1,116 @@
-// src/ConfirmOrder/components/ChoosePicker/index.js
-const computedBehavior = require('miniprogram-computed').behavior
-
-Component({
-  behaviors: [computedBehavior],
-  options: {
-    styleIsolation: 'shared',
-  },
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    pickerUserInfo: {
-      type: Object || String,
-      value: () => {},
-      observer(newVal, oldVal) {
-        if (Object.keys(newVal).length > 0) {
-          if (newVal.picker && newVal.picker_contact){
-            this.setData({
-              hasData: true
-            })
-          } else {
-            this.setData({
-              hasData: false
-            })
-          }
-        } else {
-          this.setData({
-            hasData: false
-          })
-        }
-        if (this.data.express_type === 2 && !newVal?.picker) {
-          this.triggerEvent('dataChange', {
-            name: 'pickerUserInfo',
-            errMsg: '请填写提货人',
-          });
-        } else {
-          this.triggerEvent('dataChange', {
-            name: 'pickerUserInfo',
-            errMsg: '',
-          });
-        }
-      }
-    },
-    express_type: {
-      type: Number,
-      value: 1,
-    },
-    pickerList: {
-      type: Array,
-      value: () => [],
-    },
-    isShowSelectShipper: {
-      type: Boolean,
-      value: false,
-    },
-    isShowCreateShipper: {
-      type: Boolean,
-      value: false,
-    },
-    backPage: {
-      type: Number,
-      value: 1,
-    },
-    shipperType: {
-      type: Number,
-      value: 1,
-    },
-    express_type: {
-      type: Number,
-      value: 1,
-    },
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    hasData: false,
-  },
-  lifetimes: {
-    attached: function () {
-      if (this.data.express_type === 2 && !this.data.pickerUserInfo?.picker) {
-        console.log(111);
-        this.triggerEvent('dataChange', {
-          name: 'pickerUserInfo',
-          errMsg: '请填写提货人',
-        });
-      }
-    },
-  },
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    // 选择提货人
-    selectShipper() {
-      this.triggerEvent('dataChange', {
-        name: 'pickerUserInfo',
-        errMsg: '',
-      });
-      this.triggerEvent("updataData", {
-        isShowSelectShipper: true
-      })
-    },
-    // 新建提货人
-    createShipper() {
-      this.triggerEvent("updataData", {
-        isShowCreateShipper: true,
-        shipperType: 1,
-        backPage: 1,
-        backType: 1
-      })
-    }
-  }
+// src/ConfirmOrder/components/ChoosePicker/index.js
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  options: {
+    styleIsolation: 'shared',
+  },
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    pickerUserInfo: {
+      type: Object || String,
+      value: () => {},
+      observer(newVal, oldVal) {
+        if (Object.keys(newVal).length > 0) {
+          if (newVal.picker && newVal.picker_contact){
+            this.setData({
+              hasData: true
+            })
+          } else {
+            this.setData({
+              hasData: false
+            })
+          }
+        } else {
+          this.setData({
+            hasData: false
+          })
+        }
+        if (this.data.express_type === 2 && !newVal?.picker) {
+          this.triggerEvent('dataChange', {
+            name: 'pickerUserInfo',
+            errMsg: '请填写提货人',
+          });
+        } else {
+          this.triggerEvent('dataChange', {
+            name: 'pickerUserInfo',
+            errMsg: '',
+          });
+        }
+      }
+    },
+    express_type: {
+      type: Number,
+      value: 1,
+    },
+    pickerList: {
+      type: Array,
+      value: () => [],
+    },
+    isShowSelectShipper: {
+      type: Boolean,
+      value: false,
+    },
+    isShowCreateShipper: {
+      type: Boolean,
+      value: false,
+    },
+    backPage: {
+      type: Number,
+      value: 1,
+    },
+    shipperType: {
+      type: Number,
+      value: 1,
+    },
+    express_type: {
+      type: Number,
+      value: 1,
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    hasData: false,
+  },
+  lifetimes: {
+    attached: function () {
+      if (this.data.express_type === 2 && !this.data.pickerUserInfo?.picker) {
+        console.log(111);
+        this.triggerEvent('dataChange', {
+          name: 'pickerUserInfo',
+          errMsg: '请填写提货人',
+        });
+      }
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 选择提货人
+    selectShipper() {
+      this.triggerEvent('dataChange', {
+        name: 'pickerUserInfo',
+        errMsg: '',
+      });
+      this.triggerEvent("updataData", {
+        isShowSelectShipper: true
+      })
+    },
+    // 新建提货人
+    createShipper() {
+      this.triggerEvent("updataData", {
+        isShowCreateShipper: true,
+        shipperType: 1,
+        backPage: 1,
+        backType: 1
+      })
+    }
+  }
 })