nyx weapp: 页面更新

1. 添加默认的标语和城市
2. 在无商家的时候, 不显示"商家信息编辑功能"

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

-// pages/member/activity-post/activity-post.js
+// pages/member/activity-post/activity-post.js
@@ -85,6 +85,9 @@ Page({
 
   //在进入页面时就执行，用于初始化
   onReady: function (e) {
+    var _this = this;
+    var canClick = true;
+    _this.setData({ canClick })
 
   },
 
@@ -136,6 +139,10 @@ Page({
     //   app.globalData.postData.photoArray = newFilePaths
     //   wx.navigateTo({ url: './edit/edit' })
     // });
+
+    //先设置支付按钮为可点击
+    var canClick = true; 
+    _this.setData({ canClick })    
     
     //离开的时候再赋值全局变量
     app.globalData.postData.photoArray = newFilePaths
@@ -184,6 +191,10 @@ Page({
       },
       complete: function(e)
       {
+
+        //无论成功与否，设置按钮可点击
+        var canClick = true;     
+        _this.setData({ canClick })
       }
     })
   },

增值产品-小程序及app/nyx-master/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
@@ -169,7 +169,12 @@ Page({
       var defaultCity = app.globalData.defaultCity
       _this.setData({ defaultCity })
       var member = app.globalData.member || {}
-      member["member_city"] = defaultCity
+      
+      if(!member.hasOwnProperty('member_city'))
+      {
+        member["member_city"] = defaultCity
+      }    
+
       if(!member.hasOwnProperty('member_slogan'))
       {
         member["member_slogan"] = "标语待完善"
@@ -178,6 +183,8 @@ Page({
       {
         member["member_logo"] = ""
       }
+
+      app.globalData.member = member
       _this.setData({ member})
 
       // 获取该member下的所有地址信息memberInfos
@@ -200,12 +207,15 @@ Page({
   
   onReady: function (e) {
     var _this = this;
+    var canClick = true;
+    _this.setData({ canClick })    
     //进入页面就自动获取oss参数
     _this.oss('userToken');
     if(_this.data.members.length == 0)
     {
       _this.oss('logoToken');
     }
+  
   },
 
   // Date Flow
@@ -1004,26 +1014,25 @@ Page({
           var addresses = []  
           var memberInfo = {}        
           var dict = res.data.data
-          for(var i=0; i<dict.length; i++)      
-          {
-            var result = {}
-            result['member_id'] = dict[i].memberId
-            result['address_id'] = dict[i].addressId
-            result['address_status'] = dict[i].addressStatus
-            result['member_name'] = dict[i].memberName
-            result['member_address'] = dict[i].memberAddress
-            result['member_slogan'] = dict[i].memberSlogan
-            result['member_logo'] = dict[i].memberLogo
-            addresses.push(dict[i].memberAddress)
-            memberInfos.push(result)
-
-          }
-
           if(dict.length >= 1)
           {
+            for(var i=0; i<dict.length; i++)      
+            {
+              var result = {}
+              result['member_id'] = dict[i].memberId
+              result['address_id'] = dict[i].addressId
+              result['address_status'] = dict[i].addressStatus
+              result['member_name'] = dict[i].memberName
+              result['member_address'] = dict[i].memberAddress
+              result['member_slogan'] = dict[i].memberSlogan
+              result['member_logo'] = dict[i].memberLogo
+              addresses.push(dict[i].memberAddress)
+              memberInfos.push(result)  
+            }
             memberInfo = memberInfos[0]
-            app.globalData.memberInfo = memberInfo
           }
+
+          app.globalData.memberInfo = memberInfo
           _this.setData({ memberInfos, memberInfo, addresses })
           wx.setStorageSync('memberInfo', memberInfo)
 

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

-<view class="page-body">
+<view class="page-body">
@@ -61,7 +61,7 @@
                 <view class="note-column-left align justify">
                   <view class="weui-uploader__bd">
                     <!-- start of 已上传 -->
-                    <block wx:if="{{memberInfos[curAddress].member_logo!=''}}">
+                    <block wx:if="{{members.length > 0}}">
                       <view class="weui-uploader__files">
                         <block wx:for="{{[memberInfos[curAddress].member_logo]}}" wx:for-item="image">
                           <view class="weui-uploader__file">
@@ -146,22 +146,24 @@
       </view>
       <!-- end of 商家信息 -->
 
-      <!-- start of 更新商家信息 -->
-      <view class="weui-cells__title">#更新商家信息</view>
-      <view class="navBar" >
-        <scroll-view class="navBar-box" style="display:flex">
-            <!-- <view class="cate-list" bindtap="updateMember"  id="00" data-title="新增商家信息">
-            <image src="../../../../icon/add_3.png"/>新增商家信息</view> -->
-            <view class="cate-list" bindtap="toMemberEdit" id="01" data-title="修改商家信息">
-            <image src="../../../../icon/edit.png"/>修改商家信息</view>
-            <view class="cate-list" bindtap="toMemberEdit" id="02" data-title="新增地址信息">
-            <image src="../../../../icon/add_3.png"/>新增地址信息</view>       
-        </scroll-view>
-        <scroll-view class="navBar-box" style="display:flex">
-            <view class="cate-list" bindtap="toMemberEdit" id="03" data-title="新增商家信息">
-            <image src="../../../../icon/add_3.png"/>新增商家信息</view>            
-        </scroll-view>
-      </view>
-      <!-- end of 更新商家信息 -->
+      <block wx:if="{{members.length>0}}">
+        <!-- start of 更新商家信息 -->    
+        <view class="weui-cells__title">#更新商家信息</view>
+        <view class="navBar" >
+          <scroll-view class="navBar-box" style="display:flex">
+              <!-- <view class="cate-list" bindtap="updateMember"  id="00" data-title="新增商家信息">
+              <image src="../../../../icon/add_3.png"/>新增商家信息</view> -->
+              <view class="cate-list" bindtap="toMemberEdit" id="01" data-title="修改商家信息">
+              <image src="../../../../icon/edit.png"/>修改商家信息</view>
+              <view class="cate-list" bindtap="toMemberEdit" id="02" data-title="新增地址信息">
+              <image src="../../../../icon/add_3.png"/>新增地址信息</view>       
+          </scroll-view>
+          <scroll-view class="navBar-box" style="display:flex">
+              <view class="cate-list" bindtap="toMemberEdit" id="03" data-title="新增商家信息">
+              <image src="../../../../icon/add_3.png"/>新增商家信息</view>            
+          </scroll-view>
+        </view>
+        <!-- end of 更新商家信息 -->
+      </block>
 
 </view>
\ No newline at end of file

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

-<view class="page-body">
+<view class="page-body">
@@ -16,7 +16,7 @@
 
                 <!-- 地址 -->
                 <view class="weui-uploader__hd">                
-                  <input class="weui-input" bindinput="bindSlogan" placeholder="1、请输入店铺标语" />                   
+                  <input class="weui-input" bindinput="bindSlogan" placeholder="1、请输入店铺标语" value="{{memberInfo.member_slogan}}" />                   
                 </view>              
 
                 <!-- start of note-row -->