Merge branch 'yd11_20200922' of

taobao_mini/client/pages/homePage/homePage.js

@@ -529,6 +529,18 @@ Page({
     }
   },
 
+  /**
+   * 显示通用弹层
+   * @param {object} options content: 通用弹层内容 btnText:按钮文案 confirmCallback: 按钮确认回调
+   */
+  showCommonModal({ content, btnText, confirmCallback }) {
+    this.setData({
+      commonModalConfirm: confirmCallback || null,
+      commonModalVisible: true,
+      commonModalData: { content, btnText }
+    });
+  },
+
   changeURLArg(url, arg, arg_val) {
     var pattern = arg + '=([^&]*)';
     var replaceText = arg + '=' + arg_val;

taobao_mini/client/pages/myprize/myprize.js

@@ -151,7 +151,7 @@ Page({
     const params = {
       activityId,
       area:countyName,
-      addressdetail:detailInfo,
+      addressDetail:detailInfo,
       name,
       phone: telNumber,
       detailInfo,
@@ -162,6 +162,7 @@ Page({
       provinceName,
       countyName,
       streetName,
+      id:item._id,
       _id: item._id
     }