nyx weapp: 功能修改

1. 通过canClick来控制提交时候按钮不可点击 2. 在member-edit加载之后申请oss数据

nyx weapp: 功能修改
1. 通过canClick来控制提交时候按钮不可点击 2. 在member-edit加载之后申请oss数据
190d7036 · jscat · 8628ba7b · 190d7036 · 190d7036 · 190d7036
Commit 190d7036 authored Sep 26, 2020 by jscat
--- a/增值产品-小程序及app/nyx-master/app.js
+++ b/增值产品-小程序及app/nyx-master/app.js
 //app.js
@@ -76,7 +76,7 @@ App({
    switchId : "",
    defaultCity: '上海',
-    defaultCounty: '静安区'
+    defaultCounty: '静安区',
  },
@@ -763,6 +763,41 @@ App({
  },
+  // 获得oss配置信息
+  // jscat0901 dir是指上传的目录 'user-dir/' 或者是 'logo-dir/'
+  // 每一个上传目录对应的oss 参数是不一致的
+  oss: function (dir) {
+    var _this = this;
+    console.log("===this is oss");
+    //token信息
+    var strUrl = config.oss_token_url + "?tokenName=ios&userName=1234&dirType=" + dir
+    wx.request({
+      url: strUrl,
+      method: 'GET',
+      header: {
+        'content-type': 'application/json'
+      },
+      success: res => {
+        if (res.statusCode == 200) {
+          console.log("=== oss getToken 返回值_", res.data)
+          var dict = {
+            accessid: res.data.data.accessid,
+            policy: res.data.data.policy,
+            signature: res.data.data.signature,
+            host: res.data.data.host,
+            dir: res.data.data.dir,
+            expire: res.data.data.expire,
+            securityToken: res.data.data.securityToken,
+          }
+          //通过storage来进行数据的全局共享
+          var oss = wx.getStorageSync('oss') || {}
+          oss[dir] = dict
+          wx.setStorageSync('oss', oss)
+        }
+      }
+    })
+  },  
  //用于oss_promise
  oss_promise: function (dir, resolve) {
    var _this = this;

--- a/增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-submit/activity-submit.js
+++ b/增值产品-小程序及app/nyx-master/pages/member/activity-post/activity-submit/activity-submit.js
 // pages/member/activity-post/activity-submit/activity-submit.js
@@ -76,6 +76,7 @@ Page({
    */
    if(options.mode != undefined)
    {
+      console.log("enter into activity-submit.js onLoad options", options.mode)
      var curAddress = _this.data.curAddress
      //修改值
      if(options.mode == "01")
@@ -91,13 +92,12 @@ Page({
      //新增address值, memberInfos 新增
      else if(options.mode == "02")
      {
-        curAddress = curAddress + 1
+        curAddress = _this.data.memberInfos.length
        var memberInfo = app.globalData.memberInfo
        var memberInfos = _this.data.memberInfos
        var addresses = _this.data.addresses
        memberInfos.push(memberInfo)
        addresses.push(memberInfo.member_address)
        _this.setData({ memberInfo, memberInfos, addresses, curAddress})
      }
      //新增member值, members, member改变, memberInfo改变, memberInfos改变

--- a/增值产品-小程序及app/nyx-master/pages/member/activity-post/member-edit/member-edit.js
+++ b/增值产品-小程序及app/nyx-master/pages/member/activity-post/member-edit/member-edit.js
 // pages/member/activity-post/activity-submit/activity-submit.js
@@ -55,7 +55,7 @@ Page({
    curIndex: 0,
    curAddress: 0,
-    // 支付按钮可用状态
+    // 确认/取消按钮可用状态
    canClick: true,    
    // 页面标题
@@ -126,6 +126,12 @@ Page({
  },
  onReady: function (e) {
+    var _this = this;
+    //进入页面就自动获取oss参数
+     app.oss('logoToken');
+     var canClick = true;
+     _this.setData({ canClick })
  },
  // Date Flow
@@ -215,6 +221,7 @@ Page({
        confirmText: '确认'
      })
+      _this.setData({ canClick: true})
      return false;
    }    
    else if(_this.data.memberInfo.member_logo == "")
@@ -226,6 +233,7 @@ Page({
        confirmText: '确认'
      })
+      _this.setData({ canClick: true})
      return false;
    }  
    else if(_this.data.memberInfo.member_name == "")
@@ -237,6 +245,7 @@ Page({
        confirmText: '确认'
      })
+      _this.setData({ canClick: true})
      return false;
    }
    else if(_this.data.memberInfo.member_city == "")
@@ -248,6 +257,7 @@ Page({
        confirmText: '确认'
      })
+      _this.setData({ canClick: true})
      return false;
    }    
    else if(_this.data.memberInfo.member_address == "")
@@ -259,6 +269,7 @@ Page({
        confirmText: '确认'
      })
+      _this.setData({ canClick: true})
      return false;
    }
@@ -287,6 +298,15 @@ Page({
    var _this = this;
    var mode = _this.data.mode
+    var canClick = _this.data.canClick
+    //可确认状态才执行数据操作
+    if(canClick == true)
+    {
+      //do nothing
+      //先设置按钮不可点击
+      var canClick = false; 
+      _this.setData({ canClick })
      if(mode == "01") //修改商家信息 editMember
      {
@@ -308,6 +328,8 @@ Page({
        }      
      }      
+    } 
  },
  // 取消
@@ -427,15 +449,15 @@ Page({
          //表示新增了一个字符串
          var options = {'mode': '02'}
          var pages = getCurrentPages();//当前页面栈
          if (pages.length > 1) {
+            console.log("enter into addAddress prevPage.updateMemberData(options)")
            var prevPage = pages[pages.length - 2];//获取上一个页面实例对象         
            prevPage.updateMemberData(options);//触发父页面中的方法
          }
-          _this.showToast("商家信息修改成功")
+          _this.showToast("商家地址新增成功")
        }   
      }
@@ -507,7 +529,8 @@ Page({
      success: function(){
        setTimeout(function(){
          var showToast = false
-          _this.setData({ showToast }) 
+          var canClick = true
+          _this.setData({ showToast, canClick }) 
          wx.navigateBack({
            delta: 1
          })                  

--- a/增值产品-小程序及app/nyx-master/pages/member/activity-post/member-edit/member-edit.wxml
+++ b/增值产品-小程序及app/nyx-master/pages/member/activity-post/member-edit/member-edit.wxml
 <view class="page-body">
@@ -153,8 +153,8 @@
      <view class="navBar" >
        <view class="navBar-box" style="display:flex; justify-content: center;align-items: center;">
-            <view class="cate-list on" bindtap="toConfirm">确认</view>
+            <view class="cate-list {{canClick==true?'on':''}}" bindtap="toConfirm" disabled="{{!canClick}}" >确认</view>
-            <view class="cate-list" bindtap="toCancel">取消</view>
+            <view class="cate-list" bindtap="toCancel" disabled="{{!canClick}}" >取消</view>
        </view>
      </view>