实现订单地址回填；地址新增编辑

bgj/pointsBasedOrder/detail.js

@@ -106,6 +106,10 @@ Page({
 
   /* 提交订单 */
   submitOrder() {
+    // 校验收货地址是否已填写
+    if (!this.data.detail.rec_contactsid) {
+      return wx.showToast({ title: '请填写收货信息！', icon: 'none' });
+    }
     wx.showModal({
       title: '提示',
       content: '确认提交该订单吗？',

bgj/pointsBasedOrder/modules/product/list/index.wxml

@@ -25,7 +25,7 @@
         </view>
       </view>
       <view wx:if="{{!disabled}}" class="delete" data-item="{{item}}" catchtap="deleteProduct">
-        <text class="iconfont icon-guanlian-shanchu" />
+        <van-icon custom-class='icon' name="delete-o" />
       </view>
     </view>
   </view>

pages/tabbar/mine/address/index.js

@@ -78,26 +78,22 @@ Page({
       url: `/pages/tabbar/mine/address/update?id=${this.data.content.sys_enterpriseid}`
     });
   },
-  /* 设为默认地址 */
+  /* 设为默认地址（与 Web 一致，使用编辑接口） */
   setDefault(e) {
     let item = this.data.list[e.currentTarget.dataset.index];
     if (item.isdefault == 1) return;
-    let content = {
-      contactsid: item.contactsid,
-      sys_enterpriseid: item.sys_enterpriseid,
-      name: item.name,
-      phonenumber: item.phonenumber,
-      province: item.province || "",
-      city: item.city || "",
-      county: item.county || "",
-      address: item.address || "",
-      remarks: item.remarks || "",
-      workaddress: 1,
-      isdefault: 1
-    };
     _Http.basic({
-      id: 20221009155703,
-      content
+      id: 20221018141802,
+      content: {
+        contactsid: item.contactsid,
+        name: item.name,
+        phonenumber: item.phonenumber,
+        province: item.province || "",
+        city: item.city || "",
+        county: item.county || "",
+        address: item.address || "",
+        isdefault: 1
+      }
     }).then(res => {
       if (res.code != '1') return wx.showToast({
         title: res.msg,

pages/tabbar/mine/address/update.js

@@ -82,44 +82,61 @@ Page({
     },
     submit() {
         let formData = this.selectComponent("#Form").submit();
-        let content = Object.assign({
-            "contactsid": this.data.editContactsid || 0,
-            sys_enterpriseid,
-            sex: "男",
-            "name": "",
-            "depname": "",
-            "position": "",
-            "isleader": 1,
-            "birthday": "",
-            "phonenumber": "",
-            "email": "",
-            "address": "",
-            "remarks": "",
-            "workaddress": 1,
-            "isdefault": 0
-        }, formData);
-        content.province = content.region[0] || "";
-        content.city = content.region[1] || "";
-        content.county = content.region[2] || "";
-        delete (content.region);
-        this.setData({
-            loading: true
-        });
+        let isEdit = this.data.isEdit;
+        let apiId, content;
+
+        if (isEdit) {
+            // 编辑：与 Web 一致使用 20221018141802
+            content = {
+                contactsid: this.data.editContactsid,
+                name: formData.name || "",
+                phonenumber: formData.phonenumber || "",
+                province: formData.region ? formData.region[0] || "" : "",
+                city: formData.region ? formData.region[1] || "" : "",
+                county: formData.region ? formData.region[2] || "" : "",
+                address: formData.address || "",
+                isdefault: formData.isdefault != null ? formData.isdefault : 0
+            };
+            apiId = 20221018141802;
+        } else {
+            // 新增：使用 20221009155703
+            content = Object.assign({
+                "contactsid": 0,
+                sys_enterpriseid,
+                sex: "男",
+                "name": "",
+                "depname": "",
+                "position": "",
+                "isleader": 1,
+                "birthday": "",
+                "phonenumber": "",
+                "email": "",
+                "address": "",
+                "remarks": "",
+                "workaddress": 1,
+                "isdefault": 0
+            }, formData);
+            content.province = content.region[0] || "";
+            content.city = content.region[1] || "";
+            content.county = content.region[2] || "";
+            delete (content.region);
+            apiId = 20221009155703;
+        }
+
+        this.setData({ loading: true });
         _Http.basic({
-            id: 20221009155703,
+            id: apiId,
             content
         }).then(res => {
             console.log("保存地址", res);
-            this.setData({
-                loading: false
-            });
+            this.setData({ loading: false });
             if (res.code != '1') return wx.showToast({
                 title: res.msg,
                 icon: "none",
                 mask: true
             });
             wx.showToast({
-                title: getApp().globalData.Language.getMapText(this.data.isEdit ? '修改成功' : '添加成功'),
+                title: getApp().globalData.Language.getMapText(isEdit ? '修改成功' : '添加成功'),
                 icon: "none",
                 mask: true
             });