nyx weapp: 数据更新

1. 为tbl_member表添加member_city字段
2. 为tbl_address表添加city_name字段

增值产品-小程序及app/nyx-dev/pages/member/activity-post/activity-submit/activity-submit.js

-// pages/member/activity-post/activity-submit/activity-submit.js
+// pages/member/activity-post/activity-submit/activity-submit.js
@@ -707,7 +707,7 @@ Page({
     app.globalData.postData.photoArray = newFilePaths;
   },
 
-  // 直接注册member
+  // 直接注册member, 如果已经上传成功了logo
   // todo not finished jscat 20200902
   onRegMember(resolve)
   {
@@ -715,6 +715,7 @@ Page({
     var member_id  = "mid_" + util.wxuuid()
     app.globalData.member.member_id = member_id
     var member_name = app.globalData.member.member_name
+    var member_city = app.globalData.member.member_city
     var member_address = app.globalData.member.member_city + app.globalData.member.member_address
     //即时更新member_address的值
     app.globalData.member.member_address = member_address
@@ -724,6 +725,7 @@ Page({
     console.log("===this is onRegMember");
 
     var query_url = '?userId=' + user_id + '&memberId=' + member_id + '&memberName=' + member_name
+                  + '&memberCity=' + member_city
                   + '&memberAddress=' + member_address
                   + '&memberSlogan=' + member_slogan
     var strUrl = config.member_reg_url + query_url
@@ -754,6 +756,7 @@ Page({
     var address_id  = "addid_" + util.wxuuid()
     app.globalData.member.member_id = member_id
     var member_name = app.globalData.member.member_name
+    var member_city = app.globalData.member.member_city
     var member_address = app.globalData.member.member_city + app.globalData.member.member_address
     //即时更新member_address的值
     app.globalData.member.member_address = member_address    
@@ -777,17 +780,17 @@ Page({
       promise_oss.then(
         function (value) {
           console.log("===enter promise_oss then_pass")
-          _this.uploadMember(member_id, address_id, member_name, member_address, member_slogan, logoArray, resolve, reject)
+          _this.uploadMember(member_id, address_id, member_name, member_city, member_address, member_slogan, logoArray, resolve, reject)
         });
     }
     else
     {
-      _this.uploadMember(member_id, address_id, member_name, member_address, member_slogan, logoArray, resolve, reject)
+      _this.uploadMember(member_id, address_id, member_name, member_city, member_address, member_slogan, logoArray, resolve, reject)
     }
   },
 
   //上传商家信息到(阿里云)
-  uploadMember: function (member_id, address_id, member_name, member_address, member_slogan, logoArray, resolve, reject) {
+  uploadMember: function (member_id, address_id, member_name, member_city, member_address, member_slogan, logoArray, resolve, reject) {
     var _this = this;
     var pic = logoArray[0]
     console.log(pic)
@@ -826,6 +829,7 @@ Page({
     app.globalData.member['address_id'] = address_id
     app.globalData.member['member_id'] = member_id
     app.globalData.member['member_name'] = member_name
+    app.globalData.member['member_city'] = member_city
     app.globalData.member['member_address'] = member_address
     app.globalData.member['member_slogan'] = member_slogan
 
@@ -833,7 +837,7 @@ Page({
     var strUrl = config.oss_member_callback_url
     var callback_param = {
       'callbackUrl': strUrl,
-      'callbackBody': 'filename=${object}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}&memberName=' + encodeURI(encodeURI(member_name)) + '&memberAddress=' + encodeURI(encodeURI(member_address)) + '&memberSlogan=' + encodeURI(encodeURI(member_slogan)) + '&image=' + member_logo + '&memberId=' + member_id + '&userId=' + user_id + '&addressId=' + address_id,
+      'callbackBody': 'filename=${object}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}&memberName=' + encodeURI(encodeURI(member_name)) + '&memberCity=' + encodeURI(encodeURI(member_city)) + '&memberAddress=' + encodeURI(encodeURI(member_address)) + '&memberSlogan=' + encodeURI(encodeURI(member_slogan)) + '&image=' + member_logo + '&memberId=' + member_id + '&userId=' + user_id + '&addressId=' + address_id,
       'callbackBodyType': "application/x-www-form-urlencoded",
     }
     var base64_callback_body = base64.encode(JSON.stringify(callback_param));
@@ -1023,6 +1027,7 @@ Page({
               result['address_id'] = dict[i].addressId
               result['address_status'] = dict[i].addressStatus
               result['member_name'] = dict[i].memberName
+              result['member_city'] = dict[i].memberCity
               result['member_address'] = dict[i].memberAddress
               result['member_slogan'] = dict[i].memberSlogan
               result['member_logo'] = dict[i].memberLogo

增值产品-小程序及app/nyx-dev/pages/member/activity-post/member-edit/member-edit.js

-// pages/member/activity-post/activity-submit/activity-submit.js
+// pages/member/activity-post/activity-submit/activity-submit.js
@@ -109,6 +109,7 @@ Page({
       memberInfo.address_id = ""
       memberInfo.address_status = "00"
       memberInfo.member_name = ""
+      memberInfo.member_city = ""
       memberInfo.member_address = ""
       memberInfo.member_slogan = "标语待完善中"
       memberInfo.member_logo = ""
@@ -420,7 +421,7 @@ Page({
     var _this = this;
     var memberInfo = _this.data.memberInfo
     
-    var query_url = '?memberId=' + memberInfo.member_id + '&memberAddress='+memberInfo.member_address
+    var query_url = '?memberId=' + memberInfo.member_id + '&memberCity='+memberInfo.member_city + '&memberAddress='+memberInfo.member_address
 
     var strUrl = config.member_add_address_url + query_url
     config.debug == 1 ? console.log("===strUrl is: \"" + strUrl + "\"") : ""