登录修改，增加登录协议等，修复拼团客服等

pages/shop/ShoppingCart/index.vue

@@ -130,7 +130,7 @@
         </view>
       </view>
     </view>
-    <Authorization v-else />
+    <Authorization v-else ref="authorization" />
   </view>
 </template>
 <script>
@@ -197,7 +197,15 @@
     //     cartList(list) {
     //       this.validList = list.valid;
     //     }
-    //   },
+    //   },
+	onLoad() {
+	  // if (wx.getUserProfile) {
+	  //   this.canIUseGetUserProfile = true
+	  // }
+	  if (!this.$store.getters.token && !this.userInfo.uid) {
+	    this.$refs.authorization.getLoginCode()
+	  }
+	},
     watch: {
       userInfo(user) {
         if (user.uid) {

pages/shop/news/NewsDetail/index.vue

@@ -1,12 +1,15 @@
-<template>
-  <view class="newsDetail">
-    <view class="title">{{ articleInfo.title }}</view>
-    <view class="list acea-row row-middle">
-      <view class="label cart-color line1">新闻专区</view>
-      <view class="item"> <text class="iconfont icon-shenhezhong"></text>{{ articleInfo.addTime }} </view>
-      <view class="item"> <text class="iconfont icon-liulan"></text>{{ articleInfo.visit }} </view>
-    </view>
-    <view class="conter" v-html="articleInfo.content"></view>
+<template>
+  <view class="newsDetail" v-if="isShow">
+    <view class="conter" v-html="articleInfo.content"></view>
+  </view>
+  <view class="newsDetail" v-else>
+    <view class="title">{{ articleInfo.title }}</view>
+    <view class="list acea-row row-middle">
+      <view class="label cart-color line1">新闻专区</view>
+      <view class="item"> <text class="iconfont icon-shenhezhong"></text>{{ articleInfo.addTime }} </view>
+      <view class="item"> <text class="iconfont icon-liulan"></text>{{ articleInfo.visit }} </view>
+    </view>
+    <view class="conter" v-html="articleInfo.content"></view>
   </view>
 </template>
 <style scoped lang="less">
@@ -95,8 +98,17 @@ export default {
   props: {},
   data: function() {
     return {
-      articleInfo: {},
+      articleInfo: {},
+	  isShow: false
     }
+  },
+  onLoad(option) {
+  	if (option.name) {
+		this.isShow = true
+  		uni.setNavigationBarTitle({
+  			title:option.name
+  		});
+  	}
   },
   watch: {
     $yroute(to) {