Merge branch 'master' of https://git.citupro.com/zhengnaiwen_citu/menduner-uniapp

components/PositionList/index.vue

@@ -214,6 +214,7 @@ const toDetail = (isPosition, item) =>{
     font-weight: bold;
     color: #fc796f;
     top: 0;
+    border-radius: 12px;
     left: 0;
     width: 100%;
     height: 100%;

pages/index/welfare.vue

@@ -115,7 +115,6 @@ const getTask = async () => {
   const { data } = await getTaskList({ mark: '推荐任务', type: 0 })
   integralRules.value = data
 }
-getTask()
 // 商品列表
 const goodsList = [
   { name: '房券-高端酒店房券', point: 12000, url: 'https://minio.menduner.com/dev/menduner/hotalRoomVoucher.png' },
@@ -163,6 +162,8 @@ function init () {
   getSummary()
   // 获取余额积分
   getBalance()
+  // 获取积分规则列表
+  getTask()
 }
 
 // 获取积分余额

pages/login/index.vue

@@ -27,10 +27,10 @@
           <uni-easyinput placeholder="请输入验证码" v-model="state.sms.code" :inputBorder="false" type="number" maxlength="6"></uni-easyinput>
         </uni-forms-item>
       </uni-forms>
-      <view>
+      <!-- <view>
         <button v-if="!protocol" class="wxLogon" type="text" :plain="true" @click="showProtocolToast">微信一键登录</button>
         <button v-else class="wxLogon" type="text" :plain="true" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">微信一键登录</button>
-      </view>
+      </view> -->
 
       <button class="send-button" @tap="handleLogin"> 登录/注册 </button>
       <view class="agreement-box ss-flex ss-row-center">
@@ -136,30 +136,30 @@ const handleLogin = async () => {
 }
 
 
-const showProtocolToast = () => {
-  uni.showToast({ title: '请先阅读并同意用户协议和隐私政策', icon: 'none' })
-}
+// const showProtocolToast = () => {
+//   uni.showToast({ title: '请先阅读并同意用户协议和隐私政策', icon: 'none' })
+// }
 
 // 微信登录
-const getPhoneNumber = async (e) => {
-  if (e?.detail?.errMsg !== 'getPhoneNumber:ok') {
-    uni.showToast({ title: '微信登录失败', icon: 'none' })
-    return
-  }
-  changeType.value = 'login'
-  wx.login({
-    success: async (result) => {
-      const wxLoginCode = result?.code || ''
-      const query = {
-        loginCode: wxLoginCode,
-        phoneCode: e.detail.code,
-        state: e.detail.encryptedData,
-      }
-      await useUserStore.handleSmsLogin(query, 2)
-    },
-    fail:(res)=> { console.log("获取登录凭证code失败！", res) }
-  })
-}
+// const getPhoneNumber = async (e) => {
+//   if (e?.detail?.errMsg !== 'getPhoneNumber:ok') {
+//     uni.showToast({ title: '微信登录失败', icon: 'none' })
+//     return
+//   }
+//   changeType.value = 'login'
+//   wx.login({
+//     success: async (result) => {
+//       const wxLoginCode = result?.code || ''
+//       const query = {
+//         loginCode: wxLoginCode,
+//         phoneCode: e.detail.code,
+//         state: e.detail.encryptedData,
+//       }
+//       await useUserStore.handleSmsLogin(query, 2)
+//     },
+//     fail:(res)=> { console.log("获取登录凭证code失败！", res) }
+//   })
+// }
 </script>
 
 <style scoped lang="scss">

store/user.js

@@ -78,6 +78,7 @@ export const userStore = defineStore('user', {
     // 扫码注册登录
     async handleShareUserRegister (query) {
       const { data, code } = await shareUserRegister(query)
+      console.log(data, 'data----share-register')
       if (code === 0) {
         uni.showToast({
           title: '登录成功'

utils/request.js

@@ -198,7 +198,7 @@ http.interceptors.response.use(
 		}
 
 		// 请求成功后触发获取积分
-    if (response.config.header?.Authorization) {
+    if (uni.getStorageSync('token')) {
       const url = getSuffixAfterPrefix(response.config.url)
       if (!url || !requestCompletionTrigger.length) return response.data
       const _obj = requestCompletionTrigger.find(e => e.url === url)