From 829fb79e215e5a11f2a2756d46c65553b9687ad6 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Wed, 18 Oct 2023 11:47:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95=E5=8D=8F=E8=AE=AE=E7=AD=89?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=8B=BC=E5=9B=A2=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 icons/60x60 copy.png                  | Bin 0 -> 1759 bytes
 pages.json                            |   9 ++
 pages/activity/GroupDetails/index.vue |   2 +-
 pages/authorization/index.vue         |  76 +++++++++++-----
 pages/shop/ShoppingCart/index.vue     |  12 ++-
 pages/shop/news/NewsDetail/index.vue  |  32 ++++---
 pages/user/Login/index.vue            | 123 +++++++++-----------------
 pages/user/PersonalData/index.vue     |   6 +-
 pages/user/User/index.vue             |  13 +--
 pages/user/content/content.vue        |  22 +++++
 static/120x120.png                    | Bin 0 -> 4174 bytes
 static/60x60.png                      | Bin 0 -> 1759 bytes
 utils/index.js                        |  12 +--
 13 files changed, 178 insertions(+), 129 deletions(-)
 create mode 100644 icons/60x60 copy.png
 create mode 100644 pages/user/content/content.vue
 create mode 100644 static/120x120.png
 create mode 100644 static/60x60.png

diff --git a/icons/60x60 copy.png b/icons/60x60 copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f661ba6f2243f4f5b76a8b0534ff2a898b98c6c
GIT binary patch
literal 1759
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
BUBmzY

literal 0
HcmV?d00001

diff --git a/pages.json b/pages.json
index e1ca664..11f428b 100644
--- a/pages.json
+++ b/pages.json
@@ -435,6 +435,15 @@
         "navigationBarTitleText": "直播列表"
       }
     }
+        ,{
+            "path" : "pages/user/content/content",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
   "easycom": {
     "autoscan": true,
diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue
index cac09b4..5dbd472 100644
--- a/pages/activity/GroupDetails/index.vue
+++ b/pages/activity/GroupDetails/index.vue
@@ -131,7 +131,7 @@
         <!-- #ifdef MP-WEIXIN -->
         <button class="tui-operation-item" hover-class="tui-opcity" :hover-stay-time="150">
           <view class="iconfont icon-kefu"></view>
-          <view class="tui-operation-text tui-scale-small">客服</view>
+          <view ><button open-type="contact" class="contacButton tui-operation-text tui-scale-small">客服</button></view>
         </button>
         <!-- #endif -->
 
diff --git a/pages/authorization/index.vue b/pages/authorization/index.vue
index fe4a4db..4592057 100644
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@@ -5,30 +5,27 @@
       v-if="!token"
       class="force-login-wrap"
     >
-      <!-- <image class="logo-bg" :src="`${$VUE_APP_RESOURCES_URL}/images/logo_bg.png`" mode="aspectFill"></image> -->
-      <view class="force-login__content y-f">
-        <open-data
-          class="user-avatar"
-          type="userAvatarUrl"
-        ></open-data>
-        <open-data
-          class="user-name"
-          type="userNickName"
-        ></open-data>
-        <view class="login-notice">为了提供更优质的服务，请先登录</view>
+      <view class="force-login__content y-f">
+		<image src="@/static/120x120.png" style="width: 100rpx; height: 100rpx;border-radius: 100rpx;"></image>
+        <view class="login-notice">YSHOP电商系统</view>
         <button
           class="cu-btn author-btn"
           open-type="getPhoneNumber"
           @getphonenumber="phoneLogin"
         >手机号快捷登录</button>
-        <!-- <button class="cu-btn author-btn" v-if="canIUseGetUserProfile" @tap="getUserInfoProfile">授权并查看</button>
-		<button class="cu-btn author-btn" v-else @getuserinfo="getUserInfoBtn" open-type="getUserInfo">授权并查看</button> -->
         <button
           class="cu-btn close-btn"
-          @tap="back"
-        >暂不登录</button>
+          @tap="toLogin"
+        >其他手机登录</button>
       </view>
-    </view>
+    </view>
+	<view class="hint">
+		<radio  :checked="isChecked" @tap.stop="onChange" />
+		我已经阅读并遵守
+		<text class="link" @tap="goNewsDetail(50,'用户协议')">《用户协议》</text>与
+			<text class="link"  @tap="goNewsDetail(49,'隐私政策')">《隐私政策》</text>
+			<!--上面协议是固定的 请添加相应id文章-->
+	</view>
     <!-- #endif -->
     <!-- #ifndef MP-WEIXIN -->
     <view class="force-login-wrap">
@@ -61,7 +58,8 @@ export default {
     return {
       authorize: false,
       canIUseGetUserProfile: false,
-      code: ''
+      code: '',
+	  isChecked: false
     }
   },
   computed: {
@@ -88,7 +86,17 @@ export default {
   },
   methods: {
     ...mapActions(['changeAuthorization', 'setUserInfo']),
-    ...mapMutations(['updateAuthorizationPage']),
+    ...mapMutations(['updateAuthorizationPage']),
+	onChange() {
+		console.log('isChecked;',this.isChecked)
+		this.isChecked = !this.isChecked
+	},
+	goNewsDetail(id,name) {
+	  this.$yrouter.push({
+	    path: "/pages/shop/news/NewsDetail/index",
+	    query: { id: id,name:name }
+	  });
+	},
     toLogin() {
       this.$yrouter.push({
         path: '/pages/user/Login/index',
@@ -169,14 +177,26 @@ export default {
           uni.login({
             provider: provider,
             success: async loginRes => {
-              console.log("🚀 ~ file: index.vue:171 ~ getLoginCode ~ loginRes:", loginRes)
-              this.code = loginRes.code
+              console.log("🚀 ~ file: index.vue:171 ~ getLoginCode ~ loginRes:", loginRes)
+			  
+              this.code = loginRes.code
+			  //console.log('code11:',this.code)
             }
           })
         })
     },
     // 微信用户手机号登录
-    phoneLogin(e) {
+    phoneLogin(e) {
+		 console.log('code22:',e)
+	  if(!this.isChecked) {
+		  
+		  uni.showToast({
+		    title: '请勾选下面协议',
+		    icon: 'none',
+		    duration: 2000,
+		  })
+		  return
+	  }
       console.log('用户微信手机号登录')
       if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
         console.log('wxLoginCode', this.code)
@@ -229,7 +249,19 @@ export default {
 }
 </script>
 
-<style lang="less">
+<style lang="less">
+.hint {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 20rpx 40rpx;
+	font-size: 25rpx;
+	color: #000;
+	
+	.link {
+		color: #ff8e3c;
+	}
+}
 .container {
   flex: 1;
   display: flex;
diff --git a/pages/shop/ShoppingCart/index.vue b/pages/shop/ShoppingCart/index.vue
index 64c38ac..c6c359b 100644
--- a/pages/shop/ShoppingCart/index.vue
+++ b/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) {
diff --git a/pages/shop/news/NewsDetail/index.vue b/pages/shop/news/NewsDetail/index.vue
index adb5683..1112db7 100644
--- a/pages/shop/news/NewsDetail/index.vue
+++ b/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) {
diff --git a/pages/user/Login/index.vue b/pages/user/Login/index.vue
index ddc3fe1..3a31e39 100644
--- a/pages/user/Login/index.vue
+++ b/pages/user/Login/index.vue
@@ -1,11 +1,11 @@
 <template>
   <view class="register absolute">
-    <view class="whiteBg" v-if="formItem === 1">
+    <view class="whiteBg">
       <view class="title acea-row">
         <view class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList" @click="navTap(index)" :key="index">{{ item }}</view>
       </view>
       <!-- 手机号登录 -->
-      <view class="list" :hidden="current !== 0">
+      <view class="list">
         <form @submit.prevent="submit">
           <view class="item getPhoneCode">
             <view class="phoneInput acea-row row-between-wrapper">
@@ -23,81 +23,19 @@
           </view>
         </form>
       </view>
-      <!-- 账号密码登录 -->
-      <view class="list" :hidden="current !== 1">
-        <view class="item">
-          <view class="acea-row row-between-wrapper">
-            <input type="text" placeholder="输入手机号码" v-model="account" />
-          </view>
-        </view>
-        <view class="item">
-          <view class="acea-row row-between-wrapper">
-            <input type="password" placeholder="输入密码" v-model="password" />
-          </view>
-        </view>
-        <!-- <view class="item">
-          <view class="align-left">
-            <input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
-            <button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
-              @click="code">{{ text }}</button>
-          </view>
-        </view> -->
-      </view>
-      <view class="logon" @click="loginMobile" :hidden="current === 1">手机号登录</view>
-      <view class="logon" @click="submit" :hidden="current !== 1">登录</view>
+  
+      <view class="logon" @click="loginMobile">手机号登录</view>
       <view class="tip">
-        第一次使用?
-        <text @click="formItem = 2" class="font-color-red">立即注册</text>
-      </view>
-    </view>
-    <!-- 注册 -->
-    <view class="whiteBg" v-else>
-      <view class="title acea-row row-between-wrapper">
-        <view class="item on">注册账号</view>
+        未注册的手机号验证通过后会自动注册
       </view>
-      <view class="list">
-        <view class="item">
-          <view>
-            <!-- <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-phone_" />
-            </svg>-->
-            <input name="account" type="text" placeholder="输入手机号码" v-model="account" />
-          </view>
-        </view>
-        <view class="item">
-          <view class="align-left">
-            <!-- <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-code_1" />
-            </svg>-->
-            <input name="verifyCode" type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
-            <button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">{{ text }}</button>
-          </view>
-        </view>
-        <view class="item">
-          <view>
-            <!-- <svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-code_" />
-            </svg>-->
-            <input name="password" type="password" placeholder="填写您的登录密码" v-model="password" />
-          </view>
-        </view>
-        <!-- #ifndef H5 -->
-        <view class="item">
-          <view>
-            <!-- <svg class="icon" aria-hidden="true">
-				  <use xlink:href="#icon-phone_" />
-            </svg>-->
-            <input name="inviteCode" type="text" placeholder="输入邀请码" v-model="inviteCode" />
-          </view>
-        </view>
-        <!-- #endif -->
-      </view>
-      <view class="logon" @click="register">注册</view>
-      <view class="tip">
-        已有账号?
-        <text @click="formItem = 1" class="font-color-red">立即登录</text>
-      </view>
-    </view>
+    </view>
+	<view class="hint">
+		<radio  :checked="isChecked" @tap.stop="onChange" />
+		我已经阅读并遵守
+		<text class="link" @tap="goNewsDetail(50,'用户协议')">《用户协议》</text>与
+			<text class="link"  @tap="goNewsDetail(49,'隐私政策')">《隐私政策》</text>
+			<!--上面协议是固定的 请添加相应id文章-->
+	</view>
   </view>
 </template>
 <script>
@@ -117,7 +55,7 @@ export default {
   mixins: [sendVerifyCode],
   data: function() {
     return {
-      navList: ['手机号登录', '密码登录'],
+      navList: ['手机号登录'],
       // navList: ["手机号登录",],
       current: 0,
       account: '',
@@ -128,11 +66,24 @@ export default {
       type: 'login',
       timer: null,
       clock: 60,
-      clockText: '验证码',
+      clockText: '验证码',
+	  isChecked: false
     }
   },
-  methods: {
-    async loginMobile() {
+  methods: {
+	onChange() {
+		console.log('isChecked;',this.isChecked)
+		this.isChecked = !this.isChecked
+	  },
+    async loginMobile() {
+	  if(!this.isChecked) {
+	  		  uni.showToast({
+	  		    title: '请勾选下面协议',
+	  		    icon: 'none',
+	  		    duration: 2000,
+	  		  })
+	  		  return
+	  }
       var that = this
       const { account, captcha } = that
       try {
@@ -324,7 +275,19 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss">
+.hint {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 20rpx 40rpx;
+	font-size: 25rpx;
+	color: #000;
+	
+	.link {
+		color: #ff8e3c;
+	}
+}
 .register .whiteBg .title .item {
   border-bottom: 2px solid;
 }
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index ce7572a..ec75844 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -53,12 +53,12 @@
         </view>
     </view>
     <view class="modifyBnt bg-color-red" @click="submit">保存修改</view>
-    <!-- #ifndef MP-WEIXIN -->
+
     <view
       class="logOut cart-color acea-row row-center-wrapper"
       @click="logout"
     >退出登录</view>
-    <!-- #endif -->
+
   </view>
 </template>
 <script>
@@ -162,7 +162,7 @@ export default {
     submit: function () {
       let userInfo = this.userInfo;
       postUserEdit({
-        nickname: trim(this.userInfo.nickname),
+        nickname: trim(this.userInfo.nickname ? this.userInfo.nickname : ''),
         avatar: this.avatar,
       }).then(
         (res) => {
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index fcd5020..838b256 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -1,9 +1,9 @@
 <template>
   <view class="user">
-    <view v-if="$store.getters.token || userInfo.uid">
+    <view>
       <view
         class="getUserBaseData header bg-color-red acea-row row-between-wrapper"
-        v-if="!userInfo.avatar && !userInfo.nickname"
+        v-if="!userInfo.uid"
       >
         <button
           class="userDataBtn"
@@ -206,10 +206,10 @@
         :login_type="userInfo.login_type"
       ></SwitchWindow>-->
     </view>
-    <Authorization
+<!--    <Authorization
       v-else
       ref="authorization"
-    />
+    /> -->
   </view>
 </template>
 <script>
@@ -243,7 +243,7 @@ export default {
       this.canIUseGetUserProfile = true
     }
     if (!this.$store.getters.token && !this.userInfo.uid) {
-      this.$refs.authorization.getLoginCode()
+     // this.$refs.authorization.getLoginCode()
     }
   },
   methods: {
@@ -482,7 +482,8 @@ export default {
     },
   },
   onShow() {
-    if (this.$store.getters.token) {
+    if (this.$store.getters.token) {
+		console.log('userInfo11:',this.$store.getters.token)
       //
       uni.showLoading({
         title: '加载中',
diff --git a/pages/user/content/content.vue b/pages/user/content/content.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/user/content/content.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/static/120x120.png b/static/120x120.png
new file mode 100644
index 0000000000000000000000000000000000000000..66fe74f5a375a7a75ec04e692d7749b267490009
GIT binary patch
literal 4174
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
WE&Shbw8PDV08oUf$rs5Pe*O=axE>e)

literal 0
HcmV?d00001

diff --git a/static/60x60.png b/static/60x60.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f661ba6f2243f4f5b76a8b0534ff2a898b98c6c
GIT binary patch
literal 1759
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
BUBmzY

literal 0
HcmV?d00001

diff --git a/utils/index.js b/utils/index.js
index d8bf521..f831bbd 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -356,6 +356,7 @@ export const handleGetUserInfo = () => {
     store.dispatch('setUserInfo', res.data)
     console.log('获取用户信息后跳转回显的页面')
     let redirect = cookie.get('redirect').replace(/\ /g, '')
+	console.log('redirect:',redirect)
     if (redirect) {
       reLaunch({
         path: redirect,
@@ -363,11 +364,11 @@ export const handleGetUserInfo = () => {
       })
       return
     }
-    back()
-    // reLaunch({
-    //   path: '/pages/home/index',
-    //   // query
-    // })
+   // back()
+    reLaunch({
+      path: '/pages/home/index',
+      // query
+    })
 
     // var pages = getCurrentPages() //获取加载的页面
     // var currentPage = pages[pages.length - 1] //获取当前页面的对象
@@ -896,6 +897,7 @@ export const handleLoginFailure = () => {
   store.commit('updateAuthorization', false)
 
   let currentPageUrl = getCurrentPageUrl()
+  console.log('store.state.$deviceType:',store.state.$deviceType)
   if (store.state.$deviceType == 'weixin') {
     // 如果不是授权页面，
     if (!store.getters.isAuthorizationPage) {