Merge remote-tracking branch 'origin/dev' into dev

common/config.js

@@ -1,7 +1,7 @@
-// const REAUEST_ROOTPATH = "https://hdyjy.jiangongtong.cn/";
- // const REAUEST_ROOTPATH = "http://127.0.0.1:8083/";
-  const REAUEST_ROOTPATH = "http://192.168.130.109:8083/";
-  const ROOTPATH = "http://192.168.130.109:8083/";
+const REAUEST_ROOTPATH = "https://www.lbgjtoa.com/";
+ const ROOTPATH = "https://www.lbgjtoa.com/";
+  // const REAUEST_ROOTPATH = "http://192.168.130.109:8083/";
+  // const ROOTPATH = "http://192.168.130.109:8083/";
 //手绘图项目名称
 const HANDDRAWNNAME = "";
 module.exports = {
@@ -132,6 +132,7 @@ module.exports = {
 	loginApp:REAUEST_ROOTPATH + "/mobile/weixin/loginApp"  ,// app登录
 	registerUserApp:REAUEST_ROOTPATH + "/mobile/weixin/registerUserApp"  ,//app注册
 	getScenicListByGuids:REAUEST_ROOTPATH + "/mobile/scenic/getScenicListByGuids"  ,//获取热门景点列表
+	getScenicListByGuidss:REAUEST_ROOTPATH + "/mobile/messageInfo/getRecommendedAttractions.do"  ,//获取热门景点列表
 	deleteUserApp:REAUEST_ROOTPATH + "/mobile/weixin/deleteUserApp"  ,//注销账号
 
 
@@ -143,4 +144,9 @@ appletsAppointmentDocumentsDetails:REAUEST_ROOTPATH + "/appletsAppointment/apple
 appletsCancelAppointment:REAUEST_ROOTPATH + "/appletsAppointment/appletsCancelAppointment" ,//预约取消
 
 
+
+
+getUserInformation:REAUEST_ROOTPATH + "/mobile/wx/getUserInformation" ,//用户登录信息
+
+
 }

pages/personcenter/personcenter.vue

@@ -10,7 +10,7 @@
               <!-- 默认头像 -->
               <button class="btn_dzhi" @click="oauthUser()">
                 <!--授权按钮-->
-								<image :src="headimgurl" mode="aspectFill" class="pers_box"></image>
+                <image :src="headimgurl" class="pers_box" mode="aspectFill"></image>
               </button>
             </view>
           </view>
@@ -31,24 +31,33 @@
 
     <view class="mode_com">
       <text class="tit_com">我的应用</text>
-			<view class="dly_flex hd_pter mt_hb dzhi_bq2" style="background: #fff; padding-bottom: 40rpx; border-radius: 20rpx">
+      <view class="dly_flex hd_pter mt_hb dzhi_bq2"
+            style="background: #fff; padding-bottom: 40rpx; border-radius: 20rpx">
         <view class="w_33" @tap="jump('myReserve')">
-					<view class=""><image src="../../static/animg/p_wdpj.png" class="kou_top3" mode="aspectFill"></image></view>
+          <view class="">
+            <image class="kou_top3" mode="aspectFill" src="../../static/animg/p_wdpj.png"></image>
+          </view>
           <text class="ht_text">我的预约</text>
         </view>
 
         <view class="w_33" @tap="jump('tousu')">
-					<view class=""><image src="../../static/animg/p_lyts.png" class="kou_top3" mode="aspectFill"></image></view>
+          <view class="">
+            <image class="kou_top3" mode="aspectFill" src="../../static/animg/p_lyts.png"></image>
+          </view>
           <text class="ht_text">我的投诉</text>
         </view>
 
         <view class="w_33" @tap="jump('aboutus')">
-					<view class=""><image src="../../static/animg/p_gywm.png" class="kou_top3" mode="aspectFill"></image></view>
+          <view class="">
+            <image class="kou_top3" mode="aspectFill" src="../../static/animg/p_gywm.png"></image>
+          </view>
           <text class="ht_text">客服电话</text>
         </view>
 
         <view class="w_33" @tap="jump('delete')">
-					<view class=""><image src="../../static/animg/p_tc.png" class="kou_top3" mode="aspectFill"></image></view>
+          <view class="">
+            <image class="kou_top3" mode="aspectFill" src="../../static/animg/p_tc.png"></image>
+          </view>
           <text class="ht_text">退出登录</text>
         </view>
       </view>
@@ -63,6 +72,7 @@
 <script>
 var that;
 import aes from '@/common/aes.js';
+
 export default {
   data() {
     that = this;
@@ -292,7 +302,7 @@ export default {
                     code: res.code
                   };
                   this_.$Request.post(this_.$config.getUserInformation, data).then(res => {
-										console.log(res)
+                    uni.setStorageSync('unionid', aes.aesMinEncrypt(res.data.openid));
                   })
                   // uni.request({
                   // 	url:
@@ -453,7 +463,7 @@ export default {
               }
             }
           });
-				}else{
+        } else {
           uni.showToast({
             title: '您还未登录！',
             icon: 'none'
@@ -529,7 +539,8 @@ export default {
           userid: aes.aesDecrypt(uni.getStorageSync('unionid')),
           pageType: ''
         };
-				this.$Request.post(this.$config.imgPushFun, data).then((res) => {});
+        this.$Request.post(this.$config.imgPushFun, data).then((res) => {
+        });
       }
     }
   }