fix:some

src/api/business.js

@@ -0,0 +1,3 @@
+import { request } from '@/utils/request';
+
+

src/api/score.js

@@ -0,0 +1,15 @@
+import { request } from '@/utils/request';
+
+/**
+ * 获取用户总积分
+ * @returns
+ */
+export function getUserTotalScore(){
+  return request({
+    url:'/maintain/totalScore',
+    method: 'GET',
+    header:{
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}

src/pages.json

@@ -77,6 +77,18 @@
             "navigationBarTitleText": "优惠券"
           }
         },
+        {
+          "path": "score/index",
+          "style": {
+            "navigationBarTitleText": "我的积分"
+          }
+        },
+        {
+          "path": "checkIn/index",
+          "style": {
+            "navigationBarTitleText": "每日签到"
+          }
+        },
         {
           "path": "search/index",
           "style": {
@@ -95,23 +107,6 @@
           }
         }
       ]
-    },
-    {
-      "root": "pages/points",
-      "pages": [
-        {
-          "path": "myPoints/index",
-          "style": {
-            "navigationBarTitleText": "我的积分"
-          }
-        },
-        {
-          "path": "checkIn/index",
-          "style": {
-            "navigationBarTitleText": "每日签到"
-          }
-        }
-      ]
     }
   ],
   "tabBar": {

src/pages/business/detail/index.vue

@@ -1,18 +1,29 @@
 <template>
-  <view class="detail">
-    <view class="detailItem">
-      <u-swiper
-        :list="list6"
-        :autoplay="false"
-        indicatorStyle="right: 20px"
-        class="swiper"
-      >
-        <view slot="indicator" class="indicator-num">
-          <text class="indicator-num__text"
-            >{{ currentNum + 1 }}/{{ list6.length }}</text
-          >
-        </view>
+  <view class="container">
+    <view class="head-wrap">
+      <u-swiper height="90" radius="0" :list="list6" :autoplay="false" class="swiper">
       </u-swiper>
+      <view class="business">
+        <view class="avatar">
+          <u-avatar size="56"></u-avatar>
+        </view>
+        <view class="collect"> 收藏 </view>
+        <view class="name">商家名称</view>
+        <view class="introduce">商家介绍商家介绍</view>
+      </view>
+    </view>
+    <view class="content-info">
+      <u-cell title="位置" label="xxxxxxx" :border="false"></u-cell>
+      <u-cell title="电话" label="xxxxxxxxxxx" :border="false"></u-cell>
+      <u-cell title="营业时间" label="9:00-24:00" :border="false"></u-cell>
+      <u-cell title="简介" :border="false">
+        <view slot="label" class="u-line-1">
+          xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+        </view>
+      </u-cell>
+    </view>
+    <view>
+      <u-tabs :list="list"></u-tabs>
     </view>
   </view>
 </template>
@@ -28,6 +39,23 @@ export default {
         'https://cdn.uviewui.com/uview/swiper/swiper3.png',
         'https://cdn.uviewui.com/uview/swiper/swiper1.png',
       ],
+      list: [
+        {
+          name: '全部',
+        },
+        {
+          name: '保养',
+        },
+        {
+          name: '养成',
+        },
+        {
+          name: '维修',
+        },
+        {
+          name: '其他',
+        },
+      ],
     };
   },
   onLoad(option) {
@@ -44,25 +72,49 @@ export default {
 };
 </script>
 
-<style lang="scss">
-.indicator-num {
-  padding: 2px 0;
-  background-color: rgba(0, 0, 0, 0.35);
-  border-radius: 100px;
-  width: 35px;
-  @include flex;
-  justify-content: center;
-
-  &__text {
-    color: #ffffff;
-    font-size: 12px;
+<style lang="scss" scoped>
+.container {
+  position: relative;
+  .business {
+    width: 100%;
+    height: 180rpx;
+    background-color: #ffffff;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-end;
+    align-items: center;
+    .avatar {
+      position: absolute;
+      top: 0;
+      left: 50%;
+      transform: translate(-50%, -50%);
+    }
+    .collect {
+      position: absolute;
+      right: 40rpx;
+      top: -60rpx;
+      color: #ffffff;
+      padding: 0 10rpx;
+      border: 2rpx solid #ffffff;
+      border-radius: 10rpx;
+    }
+    .name {
+      font-size: 40rpx;
+      font-weight: bold;
+      padding: 20rpx 0 10rpx 0;
+    }
+    .introduce {
+      font-size: 32rpx;
+      padding: 10rpx 0 20rpx 0;
+    }
   }
-}
-.detailItem {
-  height: 400rpx;
-  background-color: pink;
-  .u-swiper__wrapper__item__wrapper__image.data-v-7b038a67 {
-    height: 100%;
+  .content-info {
+    background-color: #ffffff;
+    margin-top: 20rpx;
+    ::v-deep .u-cell__body{
+      padding: 4rpx 20rpx;
+    }
   }
 }
 </style>

src/pages/points/myPoints/index.vue → src/pages/client/score/index.vue

@@ -2,8 +2,11 @@
   <view class="myPoints">
     <!-- 积分和积分签到 -->
     <view class="signIn">
-      <view>20000</view>
-      <view class="signIn-item" @tap="$Router.push('/pages/points/checkIn/index')">
+      <view>{{ totalScore }}</view>
+      <view
+        class="signIn-item"
+        @tap="$Router.push('/pages/points/checkIn/index')"
+      >
         <text>签到获取积分</text>
         <u-icon name="arrow-right" color="#fff" size="16"></u-icon>
       </view>
@@ -11,7 +14,11 @@
     <!-- 积分列表 -->
     <view class="integral">
       <u-grid :border="false" col="4">
-        <u-grid-item v-for="(listItem, listIndex) in list1" :key="listIndex" @tap="$Router.push(listItem.url)">
+        <u-grid-item
+          v-for="(listItem, listIndex) in list1"
+          :key="listIndex"
+          @tap="$Router.push(listItem.url)"
+        >
           <u-icon :name="listItem.name" :size="50" color="#347caf" />
           <text class="integral-text">{{ listItem.title }}</text>
         </u-grid-item>
@@ -43,21 +50,65 @@
     <!-- 获取积分方式 -->
     <view class="method">
       <u-cell-group :border="false">
-        <u-cell size="mini" :border="false" icon="red-packet" title="发帖" isLink url="" />
-        <u-cell size="mini" :border="false" icon="red-packet" title="消费" isLink url="" />
-        <u-cell size="mini" :border="false" icon="red-packet" title="点评" isLink url="" />
-        <u-cell size="mini" :border="false" icon="red-packet" title="分享" isLink url="" />
-        <u-cell size="mini" :border="false" icon="red-packet" title="回帖" isLink url="" />
-        <u-cell size="mini" :border="false" icon="red-packet" title="广告" isLink url="" />
+        <u-cell
+          size="mini"
+          :border="false"
+          icon="red-packet"
+          title="发帖"
+          isLink
+          url=""
+        />
+        <u-cell
+          size="mini"
+          :border="false"
+          icon="red-packet"
+          title="消费"
+          isLink
+          url=""
+        />
+        <u-cell
+          size="mini"
+          :border="false"
+          icon="red-packet"
+          title="点评"
+          isLink
+          url=""
+        />
+        <u-cell
+          size="mini"
+          :border="false"
+          icon="red-packet"
+          title="分享"
+          isLink
+          url=""
+        />
+        <u-cell
+          size="mini"
+          :border="false"
+          icon="red-packet"
+          title="回帖"
+          isLink
+          url=""
+        />
+        <u-cell
+          size="mini"
+          :border="false"
+          icon="red-packet"
+          title="广告"
+          isLink
+          url=""
+        />
       </u-cell-group>
     </view>
   </view>
 </template>
 
 <script>
+import { getUserTotalScore } from '@/api/score';
 export default {
   data() {
     return {
+      totalScore:0,
       list1: [
         { name: 'photo', title: '积分说明' },
         { name: 'lock', title: '积分明细' },
@@ -66,6 +117,11 @@ export default {
       ],
     };
   },
+  onLoad(){
+    getUserTotalScore().then(res=>{
+      this.totalScore = res.data.data
+    })
+  }
 };
 </script>
 

src/pages/tabbar/home/index.vue

@@ -4,7 +4,7 @@
       <u-navbar :bgColor="'#ffffff'">
         <view slot="left">
           <text>地址</text>
-          <text class="iconfont icon-sanjiaoxing1"></text>
+          <text class="iconfont icon-chevron-down"></text>
         </view>
         <view slot="center">
           <u-search
@@ -22,7 +22,7 @@
     >
       <view class="goto-address" @click="manualGetLocation">
         <text>地址</text>
-        <text class="iconfont icon-sanjiaoxing1"></text>
+        <text class="iconfont icon-chevron-down"></text>
       </view>
       <view
         class="search-item"

src/pages/tabbar/mine/index.vue

@@ -76,7 +76,7 @@ export default {
         {
           name: 'lock',
           title: '积分',
-          url: '/pages/points/myPoints/index'
+          url: '/pages/client/score/index'
         },
         {
           name: 'star',