授权修改3

packageUser/pages/user/granary/use/use.wxml

@@ -81,7 +81,7 @@
 				<view class="use_desc">
 					<view class="use_wid">
 						<view class="desc">
-							<text wx:if="{{saleOrderInfo.operate_state || !saleOrderInfo.state}}">您可将商品上架至FOHOW玖玖进行线上销售，当消费者购买商品后，即可获取相应收入。</text>
+							<text wx:if="{{saleOrderInfo.operate_state || !saleOrderInfo.state}}">您可将商品上架至凤凰菁选商城进行线上销售，当消费者购买商品后，即可获取相应收入。</text>
 							<text wx:if="{{saleOrderInfo.state === 1 && !saleOrderInfo.operate_state}}">温馨提示：修改代销数量需先申请下架，5分钟后（以实际时间为准）收到由系统发送的下架成功通知后方可重新上架。</text>
 						</view>
 					</view>

packageUser/pages/user/invite/contribution/contribution.wxml

@@ -30,7 +30,7 @@
     <view class="con-no-main">
       <view class="con-no-maintext">正式成为合伙人 ,</view>
       <view class="con-no-maintext1">享<text style="color:#fe685a">额外1%</text>商品佣金及<text style="color:#fe685a">二级分佣资格</text>有福利 !</view>
-      <view class="con-no-maintext2">同时将有机会享有<text style="color:#fe685a">FOHOW玖玖股份</text> !</view>
+      <view class="con-no-maintext2">同时将有机会享有<text style="color:#fe685a">凤凰菁选商城股份</text> !</view>
       <view class="con-no-mainbtn" bindtap="becomepartner" wx:if="{{!itshow}}">成为合伙人</view>
       <view class="con-no-mainbtn" style="background:#ccc" wx:if="{{itshow}}">成为合伙人</view>
     </view>

packageUser/pages/user/invite/invite.wxml

@@ -153,7 +153,7 @@
       <view class="popup-logobg">
         <view class="popup-image"></view>
       </view>
-      <text class="popup-hint">FOHOW玖玖申请同意相册保存\n以确保正常使用保存相册功能</text>
+      <text class="popup-hint">凤凰菁选商城申请同意相册保存\n以确保正常使用保存相册功能</text>
       <button class="popup-bottom" open-type="openSetting" bindopensetting="setting">确认</button>
     </view>
   </view>

packageUser/pages/user/invite/material/material.wxml

@@ -55,7 +55,7 @@
       <view class="popup-logobg">
         <view class="popup-image" ></view>
       </view>
-      <text class="popup-hint">FOHOW玖玖申请同意相册保存\n以确保正常使用保存相册功能</text>
+      <text class="popup-hint">凤凰菁选商城申请同意相册保存\n以确保正常使用保存相册功能</text>
       <button class="popup-bottom" open-type="openSetting" bindopensetting="setting">确认</button>
     </view>
   </view>

packageUser/pages/user/invite/rank/rank.js

@@ -229,7 +229,7 @@ Page({
     } else {
       if (this.data.config.length > 0) {
         return {
-          title: 'FOHOW玖玖' + this.data.month + '月销售冠军，悬赏' + this.data.config[0].reward_amount / 100 + '元',
+          title: '凤凰菁选商城' + this.data.month + '月销售冠军，悬赏' + this.data.config[0].reward_amount / 100 + '元',
           path: '/pages/start/start?url=packageUser/pages/user/invite/rank/rank&year=' + this.data.year + '&month=' + this.data.month +'&invite=' + getApp().globalData.wx_id,
           imageUrl: this.data.config[0].s_img,
           success: function(res) {
@@ -241,7 +241,7 @@ Page({
       } else {
         let m = date.getMonth() + 1
         return {
-          title: 'FOHOW玖玖' + m + '月销售冠军，悬赏xxx元',
+          title: '凤凰菁选商城' + m + '月销售冠军，悬赏xxx元',
           path: '/pages/start/start?url=packageUser/pages/user/invite/rank/rank&invite=' + getApp().globalData.wx_id,
           imageUrl: 'https://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/share/rank.jpg',
           success: function(res) {

pages/customservice/customservice.wxml

@@ -13,7 +13,7 @@
       <view class="popup-logobg">
         <view class="popup-image" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/custom/kf2.png"></view>
       </view>
-      <text class="popup-hint">FOHOW玖玖申请同意相册保存\n以确保正常使用保存相册功能</text>
+      <text class="popup-hint">凤凰菁选商城申请同意相册保存\n以确保正常使用保存相册功能</text>
       <button class="popup-bottom" open-type="openSetting" bindopensetting="setting">确认</button>
     </view>
   </view>

pages/helpfarm/group/group.wxml

@@ -16,7 +16,7 @@
       <view class="popup-logobg">
         <view class="popup-image"></view>
       </view>
-      <text class="popup-hint">FOHOW玖玖申请同意相册保存\n以确保正常使用保存相册功能</text>
+      <text class="popup-hint">凤凰菁选商城申请同意相册保存\n以确保正常使用保存相册功能</text>
       <button class="popup-bottom" open-type="openSetting" bindopensetting="setting">确认</button>
     </view>
   </view>

pages/helpfarm/helpfarm-detail/helpfarm-detail.js

@@ -786,7 +786,7 @@ Page({
       ctx.textBaseline = 'middle'
       ctx.font = this.dpi(24) + 'px Arial'
       ctx.fillStyle = '#eab86a'
-      ctx.fillText('以农民最有尊严的方式扶贫，我为FOHOW玖玖助力。', this.dpi(136), this.dpi(59))
+      ctx.fillText('以农民最有尊严的方式扶贫，我为凤凰菁选商城助力。', this.dpi(136), this.dpi(59))
       ctx.restore()
       ctx.drawImage(this.posterImage.project.path, this.dpi(0), this.dpi(120), this.dpi(662), this.dpi(353))
       ctx.save()

pages/helpfarm/helpfarm-detail/helpfarm-detail.wxml

@@ -214,7 +214,7 @@
       <view class="popup-logobg">
         <view class="popup-image" src="../../../images/slogo.png"></view>
       </view>
-      <text class="popup-hint">FOHOW玖玖申请同意相册保存\n以确保正常使用保存相册功能</text>
+      <text class="popup-hint">凤凰菁选商城申请同意相册保存\n以确保正常使用保存相册功能</text>
       <button class="popup-bottom" open-type="openSetting" bindopensetting="setting">确认</button>
     </view>
   </view>

pages/helpfarm/othercustom/othercustom.wxml

@@ -16,7 +16,7 @@
       <view class="popup-logobg">
         <view class="popup-image" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/custom/kf2.png"></view>
       </view>
-      <text class="popup-hint">FOHOW玖玖申请同意相册保存\n以确保正常使用保存相册功能</text>
+      <text class="popup-hint">凤凰菁选商城申请同意相册保存\n以确保正常使用保存相册功能</text>
       <button class="popup-bottom" open-type="openSetting" bindopensetting="setting">确认</button>
     </view>
   </view>

pages/home/home.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "FOHOW玖玖商城",
+  "navigationBarTitleText": "凤凰菁选商城商城",
   "usingComponents": {
     "currency": "../../component/currency/currency",
     "format-time": "../../component/formatTime/formatTime"

pages/parse/parse.js

@@ -26,7 +26,7 @@ Page({
   },
   onShareAppMessage: function (val) {
     return _request.share({
-      title: this.data.art.s_title || this.data.art.title || 'FOHOW玖玖',
+      title: this.data.art.s_title || this.data.art.title || '凤凰菁选商城',
       path: '/pages/start/start?url=pages/parse/parse&id=' + this.data.art.id,
       imageUrl: this.data.art.cover,
       sc: 'xcx_article',

pages/parse/parse.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "FOHOW玖玖",
+  "navigationBarTitleText": "凤凰菁选商城",
   "usingComponents": {
     "format-time": "../../../component/formatTime/formatTime"
   },

pages/projects/project-detail-noshare/project-detail-noshare.wxml

@@ -312,7 +312,7 @@
     <view class="popup-logobg">
       <view class="popup-image" ></view>
     </view>
-    <text class="popup-hint">FOHOW玖玖申请同意相册保存\n以确保正常使用保存相册功能</text>
+    <text class="popup-hint">凤凰菁选商城申请同意相册保存\n以确保正常使用保存相册功能</text>
     <button class="popup-bottom" open-type="openSetting" bindopensetting="setting">确认</button>
   </view>
 </view>

pages/projects/project-detail/project-detail.wxml

@@ -332,7 +332,7 @@
     <view class="popup-logobg">
       <view class="popup-image" ></view>
     </view>
-    <text class="popup-hint">FOHOW玖玖申请同意相册保存\n以确保正常使用保存相册功能</text>
+    <text class="popup-hint">凤凰菁选商城申请同意相册保存\n以确保正常使用保存相册功能</text>
     <button class="popup-bottom" open-type="openSetting" bindopensetting="setting">确认</button>
   </view>
 </view>

pages/start/start.wxml

@@ -12,7 +12,7 @@
     <view class="popup-logobg">
       <view class="popup-image"></view>
     </view>
-    <text class="popup-hint">FOHOW玖玖申请同意微信授权\n以确保小程序正常运作</text>
+    <text class="popup-hint">凤凰菁选商城申请同意微信授权\n以确保小程序正常运作</text>
     <button class="popup-bottom" open-type="getUserInfo" bindgetuserinfo="getUserInfo">确认</button>
   </view>
   -->

pages/user/all/all.js

@@ -18,7 +18,8 @@ Page({
     merchant: {},
     info: {},
     show: 0,
-	checkhead:true
+	checkhead:true,
+	wxlogincode:''
   },
   onLoad: function () {
 ////	console.log(options)
@@ -70,11 +71,14 @@ Page({
 	  	    wx.login({
 	  		    success: res => {
 	  		      getApp().globalData.try_login = true;
-	  		      
+	  		      console.log('checkLogin',res.code)
 	  		      var url = 'xcx/login'
 	  				  var params = {
 	  				    code: res.code
 	  				  }
+					  that.setData({
+					  	wxlogincode: res.code
+					  })
 	  				  var success = function (res) {
 	  				  	console.log('pageLogin',res);
 	  				  	if(res.data.wx_user){
@@ -93,20 +97,20 @@ Page({
 	  						        var auth = res.authSetting
 	  						        	if (auth['scope.userInfo']) {
 	  						        		console.log('wxhead none')
-	  									    	wx.getUserInfo({
-	  												  success: function(res3) {
-	  												    console.log('userinfo',res3)
-	  												    var url = 'xcx/save_wx_user/info'
-	  													  var params = {
-	  													    userinfo: JSON.stringify(res3)
-	  													  }
-	  													  var success = function (res4) {
-																console.log('authorize',res4)
-																that.onShow()
-	  													  }
-	  													  _request.$post(url, params, success)
-	  												  }
-	  												})
+	  									   //  	wx.getUserInfo({
+	  												//   success: function(res3) {
+	  												//     console.log('userinfo',res3)
+	  												//     var url = 'xcx/save_wx_user/info'
+	  												// 	  var params = {
+	  												// 	    userinfo: JSON.stringify(res3)
+	  												// 	  }
+	  												// 	  var success = function (res4) {
+															// 	console.log('authorize',res4)
+															// 	that.onShow()
+	  												// 	  }
+	  												// 	  _request.$post(url, params, success)
+	  												//   }
+	  												// })
 													//新授权
 													wx.getUserProfile({
 													  desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
@@ -186,7 +190,7 @@ Page({
         title: '加载中'
       })
 	  console.log('val',val)
-      _request.sendInfo(val, channel_id, invite, that)
+      // _request.sendInfo(val, channel_id, invite, that)
       
       that.onShow();
       
@@ -202,32 +206,35 @@ Page({
     }
   },
   getUserProfile:function(){
+	  console.log('tap')
 	  var that = this
-	wx.getUserProfile({
-	  desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
-	  success: (res) => {
-		this.setData({
-		  userInfo: res.userInfo,
-		  hasUserInfo: true
-		})
-		
-		var channel_id = 0;
-		invite = wx.getStorageSync('invite');
-		if (channel && Number(channel.parent_id) > 0) {
-		  channel_id = Number(channel.parent_id)
-		}
-		var that = this
-		console.log('res',res);
-		if (res.errMsg === "getUserProfile:ok") {
-		  wx.showLoading({
-		    title: '加载中'
-		  })
-		  _request.sendInfo(res, channel_id, invite, that)
-		  
-		  that.onShow();
-		}
-	  }
-	})
+
+	        wx.getUserProfile({
+	          desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+	          success: (res) => {
+	        	this.setData({
+	        	  userInfo: res.userInfo,
+	        	  hasUserInfo: true
+	        	})
+	        	
+	        	var channel_id = 0;
+	        	invite = wx.getStorageSync('invite');
+	        	if (channel && Number(channel.parent_id) > 0) {
+	        	  channel_id = Number(channel.parent_id)
+	        	}
+	        	var that = this
+	        	console.log('res',res);
+	        	if (res.errMsg === "getUserProfile:ok") {
+	        	  wx.showLoading({
+	        	    title: '加载中'
+	        	  })
+				  res['wxlogincode'] = that.data.wxlogincode;
+	        	  _request.sendInfo(res, channel_id, invite, that)
+	        	  
+	        	  that.onShow();
+	        	}
+	          }
+	        })
   },
   getVersion: function (val) {
     this.check()
@@ -240,7 +247,7 @@ Page({
       console.log(res)
       that.setData({
         info: res.data,
-        show: res.data.wx_user.show_invite_mode
+        show: res.data.wx_user?res.data.wx_user.show_invite_mode:''
       })
     }
     _request.$get(url, params, success)

pages/web/web.js

@@ -15,7 +15,7 @@ Page({
   },
   onShareAppMessage: function (val) {
     return _request.share({
-      title: 'FOHOW玖玖',
+      title: '凤凰菁选商城',
       path: '/pages/start/start?url=pages/web/web&id=' + this.data.url,
       imageUrl: '',
       sc: 'cxc_web'

pages/web/web.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "FOHOW玖玖"
+  "navigationBarTitleText": "凤凰菁选商城"
 }

utils/request.js

@@ -3,6 +3,7 @@
 // 测试
 const apiHost = 'https://tfohowapi.hiwavo.com/'
 
+
 function $get (url, params, success, fail) {
   wx.showNavigationBarLoading()
   var session = wx.getStorageSync('lbt_session_key')
@@ -179,7 +180,7 @@ function check () {
   }
   var success = function (res) {
     console.log('login:id=' + res.data.wx_user_id)
-    getApp().globalData.wx_id = res.data.wx_user_id
+    getApp().globalData.wx_id = res.data.wx_user_id;
   }
   $get(url, params, success)
 }
@@ -208,6 +209,7 @@ function setAuthorize () {
 // 发送个人信息给后端
 function sendInfo (a, channel, invite, that) {
   // var userInfo = a.detail;
+  
   var userInfo = a;//新授权方式
   var str = JSON.stringify(userInfo)
   updateWxUserInfo(str, channel, invite, that)
@@ -216,7 +218,7 @@ function sendInfo (a, channel, invite, that) {
 function getAuthorizePopup () {
   wx.showModal({
     title: '用户未授权',
-    content: '如需正常使用FOHOW玖玖，请按确定并在授权管理中选中“用户信息”，然后点按确定。最后再重新进入小程序即可正常使用。',
+    content: '如需正常使用凤凰菁选商城，请按确定并在授权管理中选中“用户信息”，然后点按确定。最后再重新进入小程序即可正常使用。',
     showCancel: false,
     success: function (res) {
       if (res.confirm) {