xiaoe_mp_npm 0.1.1 → 0.1.2

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

@@ -1,78 +1,78 @@
-// src/ConfirmOrder/components/WechatAddress/index.js
-const computedBehavior = require('miniprogram-computed').behavior
-
-Component({
-  behaviors: [computedBehavior],
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    pageType: {
-      type: String,
-      value: "list",
-    },
-    addressList: {
-      type: Array,
-      value: () => [],
-    },
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  computed: {
-
-  },
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    // 获取微信收货地址
-    getWechat() {
-      wx.chooseAddress({
-        success: res => {
-          // 微信地址与地址列表匹配，不重复添加
-          res['noCheck'] = true
-          let compareRes = this.compareWechat(res)
-          if (compareRes === "") {
-            this.triggerEvent("createAddress", res)
-          } else {
-            if (this.data.pageType === "list") {
-              this.triggerEvent("chooseAddress", compareRes)
-            } else {
-              wx.showToast({
-                title: '已有相同收货地址',
-                icon: 'none',
-                duration: 2000
-              })
-            }
-          }
-        },
-        fail: err => {
-          console.log(err);
-        }
-      })
-    },
-    // 微信地址与地址列表匹配，不重复添加
-    compareWechat(wechatAddress) {
-      let address = "";
-      this.data.addressList.forEach((ele) => {
-        if (
-          ele.receiver == wechatAddress.userName &&
-          ele.phone == wechatAddress.telNumber &&
-          ele.province == wechatAddress.provinceName &&
-          ele.city == wechatAddress.cityName &&
-          ele.county == wechatAddress.countyName &&
-          ele.detail == wechatAddress.detailInfo
-        ) {
-          address = ele;
-        }
-      });
-      return address;
-    },
-  }
+// src/ConfirmOrder/components/WechatAddress/index.js
+const computedBehavior = require('miniprogram-computed').behavior
+
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    pageType: {
+      type: String,
+      value: "list",
+    },
+    addressList: {
+      type: Array,
+      value: () => [],
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  computed: {
+
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 获取微信收货地址
+    getWechat() {
+      wx.chooseAddress({
+        success: res => {
+          // 微信地址与地址列表匹配，不重复添加
+          res['noCheck'] = true
+          let compareRes = this.compareWechat(res)
+          if (compareRes === "") {
+            this.triggerEvent("createAddress", res)
+          } else {
+            if (this.data.pageType === "list") {
+              this.triggerEvent("chooseAddress", compareRes)
+            } else {
+              wx.showToast({
+                title: '已有相同收货地址',
+                icon: 'none',
+                duration: 2000
+              })
+            }
+          }
+        },
+        fail: err => {
+          console.log(err);
+        }
+      })
+    },
+    // 微信地址与地址列表匹配，不重复添加
+    compareWechat(wechatAddress) {
+      let address = "";
+      this.data.addressList.forEach((ele) => {
+        if (
+          ele.receiver == wechatAddress.userName &&
+          ele.phone == wechatAddress.telNumber &&
+          ele.province == wechatAddress.provinceName &&
+          ele.city == wechatAddress.cityName &&
+          ele.county == wechatAddress.countyName &&
+          ele.detail == wechatAddress.detailInfo
+        ) {
+          address = ele;
+        }
+      });
+      return address;
+    },
+  }
 })

package/miniprogram_dist/ConfirmOrder/components/WechatAddress/index.json

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

package/miniprogram_dist/ConfirmOrder/components/WechatAddress/index.less

@@ -1,25 +1,25 @@
-.wechat {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  background: white;
-  padding: 32rpx;
-  margin-bottom: 16rpx;
-  box-sizing: border-box;
-
-  .left-title {
-    display: flex;
-    align-items: center;
-
-    .icon-wechat {
-      color: #46bb36;
-      width: 30rpx;
-      height: 30rpx;
-      margin-right: 32rpx;
-    }
-
-    .ET2 {
-      font-size: 32rpx;
-    }
-  }
+.wechat {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background: white;
+  padding: 32rpx;
+  margin-bottom: 16rpx;
+  box-sizing: border-box;
+
+  .left-title {
+    display: flex;
+    align-items: center;
+
+    .icon-wechat {
+      color: #46bb36;
+      width: 30rpx;
+      height: 30rpx;
+      margin-right: 32rpx;
+    }
+
+    .ET2 {
+      font-size: 32rpx;
+    }
+  }
 }

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

@@ -1,9 +1,9 @@
-<!--src/ConfirmOrder/components/WechatAddress/index.wxml-->
-<view class="wechat">
-  <view class="left-title" bindtap="getWechat">
-    <image src="../../../common/assets/images/wx.png" class="icon-wechat"></image>
-    <view class="ET2">获取微信地址</view>
-  </view>
-  <!-- <i class="iconfont icon-zhixiang"></i> -->
-  <!-- <image src="../../../common/assets/images/icon-zhixiang.png" class="img"></image> -->
+<!--src/ConfirmOrder/components/WechatAddress/index.wxml-->
+<view class="wechat">
+  <view class="left-title" bindtap="getWechat">
+    <image src="../../../common/assets/images/wx.png" class="icon-wechat"></image>
+    <view class="ET2">获取微信地址</view>
+  </view>
+  <!-- <i class="iconfont icon-zhixiang"></i> -->
+  <!-- <image src="../../../common/assets/images/icon-zhixiang.png" class="img"></image> -->
 </view>

package/miniprogram_dist/ConfirmOrder/index.js

@@ -1,72 +1,72 @@
-/*
- * @Descripttion: 
- * @version: 
- * @Author: zongxinliu
- * @Date: 2021-11-24 14:56:56
- * @LastEditors: zongxinliu
- * @LastEditTime: 2021-11-26 12:12:30
- */
-Component({
-  properties: {
-    baseInfoQuery: {
-      type: Object,
-      value: {
-        id: "SPU_ENT_6400554425369g9r3SKsE78",
-        spu_id: "SPU_ENT_6400554425369g9r3SKsE78",
-        resource_type: 21, 
-        resource_id: "g_61c1429282dea_E8YwehuM38",
-        spu_type: "ENT",
-        sku: "SKU_ENT_6400554425369Zs60S48",
-        isCollectCoupons: true,
-        count: 7,
-        isAlive: 1,
-      }
-    },
-    showPopup: {
-      type: Boolean,
-      value: false
-    },
-    aliveInfo:{
-      type: Object,
-      value:{}
-    },
-    sensorReportParams:{
-      type: Object,
-      value:{}
-    }
-
-  },
-  data: {},
-  methods: {
-    openPopup() {
-      this.setData({
-        showPopup: true
-      });
-    },
-    onClose() {
-      this.setData({
-        showPopup: false
-      });
-      this.triggerEvent("closePop")
-    },
-    changeSheetInfo(val) {
-      this.selectComponent("#header").changeSheetInfo(val.detail)
-    },
-    // 返回箭头点击事件
-    backClick() {
-      this.selectComponent("#confirm").backClick();
-    },
-    // 支付成功
-    successCallback(payResult) {
-      console.log("支付成功1");
-      this.onClose()
-      this.triggerEvent("showPayComplete", payResult.detail);
-    },
-    // 支付失败
-    failCallback() {
-      console.log("支付失败1");
-      this.onClose()
-      this.triggerEvent("failCallback")
-    },
-  }
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: zongxinliu
+ * @Date: 2021-11-24 14:56:56
+ * @LastEditors: zongxinliu
+ * @LastEditTime: 2021-11-26 12:12:30
+ */
+Component({
+  properties: {
+    baseInfoQuery: {
+      type: Object,
+      value: {
+        id: "SPU_ENT_6400554425369g9r3SKsE78",
+        spu_id: "SPU_ENT_6400554425369g9r3SKsE78",
+        resource_type: 21, 
+        resource_id: "g_61c1429282dea_E8YwehuM38",
+        spu_type: "ENT",
+        sku: "SKU_ENT_6400554425369Zs60S48",
+        isCollectCoupons: true,
+        count: 7,
+        isAlive: 1,
+      }
+    },
+    showPopup: {
+      type: Boolean,
+      value: false
+    },
+    aliveInfo:{
+      type: Object,
+      value:{}
+    },
+    sensorReportParams:{
+      type: Object,
+      value:{}
+    }
+
+  },
+  data: {},
+  methods: {
+    openPopup() {
+      this.setData({
+        showPopup: true
+      });
+    },
+    onClose() {
+      this.setData({
+        showPopup: false
+      });
+      this.triggerEvent("closePop")
+    },
+    changeSheetInfo(val) {
+      this.selectComponent("#header").changeSheetInfo(val.detail)
+    },
+    // 返回箭头点击事件
+    backClick() {
+      this.selectComponent("#confirm").backClick();
+    },
+    // 支付成功
+    successCallback(payResult) {
+      console.log("支付成功1");
+      this.onClose()
+      this.triggerEvent("showPayComplete", payResult.detail);
+    },
+    // 支付失败
+    failCallback() {
+      console.log("支付失败1");
+      this.onClose()
+      this.triggerEvent("failCallback")
+    },
+  }
 })

package/miniprogram_dist/ConfirmOrder/index.json

@@ -1,9 +1,9 @@
-{
-  "component": true,
-  "usingComponents": {
-    "Header": "./components/Header/index",
-    "ConfirmOrderContent": "./components/ConfirmOrderContent/index",
-    "van-popup": "@vant/weapp/popup/index",
-    "CustomPopup": "../CustomPopup"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "Header": "./components/Header/index",
+    "ConfirmOrderContent": "./components/ConfirmOrderContent/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "CustomPopup": "../CustomPopup"
+  }
 }

package/miniprogram_dist/ConfirmOrder/index.less

@@ -1,5 +1,5 @@
-.popUp {
-  height: 80%;
-  border-radius: 16rpx;
-  background: rgba(245,245,245,1);
+.popUp {
+  height: 80%;
+  border-radius: 16rpx;
+  background: rgba(245,245,245,1);
 }

package/miniprogram_dist/ConfirmOrder/index.wxml

@@ -1,25 +1,25 @@
-<!--src/ConfirmOrder/index.wxml-->
-<view class="confirm-order">
-  <!-- <button bindtap="openPopup">显示确认订单</button> -->
-  <CustomPopup
-    showPopup="{{ showPopup }}"
-    customStyle="height: 80%;background: rgba(245,245,245,1)"
-    bind:onClose="onClose"
-  >
-    <view slot="header" wx:if="{{ showPopup }}" >
-      <Header id="header" bindonClose="onClose" bind:backClick="backClick" wx:if="{{ showPopup }}"></Header>
-    </view>
-    <view slot="content" wx:if="{{ showPopup }}" style="height: calc(100% - 60rpx);" >
-      <ConfirmOrderContent 
-        id="confirm" 
-        baseInfoQuery="{{ baseInfoQuery }}"
-        aliveInfo="{{ aliveInfo }}"
-        sensorReportParams="{{ sensorReportParams }}"
-        bind:changeSheetInfo="changeSheetInfo" 
-        bind:successCallback="successCallback" 
-        bind:failCallback="failCallback"
-      >
-      </ConfirmOrderContent>
-    </view>
-  </CustomPopup>
+<!--src/ConfirmOrder/index.wxml-->
+<view class="confirm-order">
+  <!-- <button bindtap="openPopup">显示确认订单</button> -->
+  <CustomPopup
+    showPopup="{{ showPopup }}"
+    customStyle="height: 80%;background: rgba(245,245,245,1)"
+    bind:onClose="onClose"
+  >
+    <view slot="header" wx:if="{{ showPopup }}" >
+      <Header id="header" bindonClose="onClose" bind:backClick="backClick" wx:if="{{ showPopup }}"></Header>
+    </view>
+    <view slot="content" wx:if="{{ showPopup }}" style="height: calc(100% - 60rpx);" >
+      <ConfirmOrderContent 
+        id="confirm" 
+        baseInfoQuery="{{ baseInfoQuery }}"
+        aliveInfo="{{ aliveInfo }}"
+        sensorReportParams="{{ sensorReportParams }}"
+        bind:changeSheetInfo="changeSheetInfo" 
+        bind:successCallback="successCallback" 
+        bind:failCallback="failCallback"
+      >
+      </ConfirmOrderContent>
+    </view>
+  </CustomPopup>
 </view>

package/miniprogram_dist/CouponList/README.md

@@ -1,6 +1,6 @@
-## 开发者：Gwenniezhou
-## 该组件的业务功能： 直播营销模块中的优惠券列表
-## 主要问题
-### 1、关于优惠券的领取操作，先判断是否需要信息采集，如果需要，则向上抛出showPopup事件，等到信息采集完成后，那边会自动帮我们这边调取领取操作，（具体代码实现可问企微的kazi），如果不需要，则直接调取领取操作
-
+## 开发者：Gwenniezhou
+## 该组件的业务功能： 直播营销模块中的优惠券列表
+## 主要问题
+### 1、关于优惠券的领取操作，先判断是否需要信息采集，如果需要，则向上抛出showPopup事件，等到信息采集完成后，那边会自动帮我们这边调取领取操作，（具体代码实现可问企微的kazi），如果不需要，则直接调取领取操作
+
 ### 2、关于后台返回接口问题，本来专属优惠券应该返回一个特定码值，但由于此领取接口涉及范围广，影响范围大，因此没让后台改，还是跟原先一样，具体可参照领取代码。