页面

src/pages/index/index.vue

@@ -51,44 +51,51 @@
 
       <view class="p-2">
         <wd-card>
-          <wd-grid :gutter="2" :column="4">
+          <wd-grid :gutter="2" :column="5">
             <view
               @click="more(item)"
               v-for="item in [
                 {
                   name: '名优特产',
                   url: '/pages/columnGoods/goods_list/index?id=38&title=名优特产',
-                  icon: '/static/icons/village_service.png',
+                  icon: '/static/icons/home1.png',
                   type: 2,
                   color: 'green',
                 },
                 {
                   name: '当季产品',
                   url: '/pages/columnGoods/goods_list/index?id=37&title=当季产品',
-                  icon: '/static/icons/agriculture_service.png',
+                  icon: '/static/icons/home2.png',
                   type: 2,
                   color: 'blue',
                 },
                 {
                   name: '滞销产品',
                   url: '/pages/columnGoods/goods_list/index?id=30&title=滞销产品',
-                  icon: '/static/icons/agriculture_course.png',
+                  icon: '/static/icons/home3.png',
                   type: 2,
                   color: 'orange',
                 },
                 {
-                  name: '村集体',
-                  url: '',
-                  icon: '/static/icons/rural_ecommerce.png',
+                  name: '美丽乡村',
+                  url: '/pages/about/index',
+                  icon: '/static/icons/home4.png',
                   type: 2,
                   color: 'red',
                 },
+                {
+                  name: '景区景点',
+                  url: '',
+                  icon: '/static/icons/home5.png',
+                  type: 1,
+                  color: 'red',
+                },
               ]"
             >
               <wd-grid-item use-slot>
                 <view class="p-2">
-                  <wd-img radius="20rpx" :width="'100rpx'" :height="'100rpx'" :src="item.icon" />
-                  <view class="ps-2 pt-2 pb-2 text-center font-size-3 font-blod color-black">
+                  <wd-img radius="20rpx" :width="'60rpx'" :height="'60rpx'" :src="item.icon" />
+                  <view class="py-2 text-center font-size-3 font-blod color-black">
                     {{ item.name }}
                   </view>
                 </view>
@@ -248,7 +255,7 @@
     </view>
     <view class="p-1">
       <wd-row class=" ">
-        <wd-col :span="12" v-for="item in index_live">
+        <wd-col :span="12" v-for="(item, index) in index_live">
           <view
             class="p-1"
             style=""
@@ -258,6 +265,7 @@
                 url: ' ',
               })
             "
+            v-if="index < 4"
           >
             <view class="py-2">
               <wd-card custom-class="card-content">
@@ -297,11 +305,18 @@
     </view>
 
     <view class="p-2">
-      <view class="py-2" v-for="item in index_play" @click="goPage(item)">
+      <view class="py-2" v-for="(item, index) in index_play" @click="goPage(item)">
+        <view v-if="index < 4">
           <wd-card custom-class="card-content">
             <view class="content p-2" style="align-items: normal">
               <view style="width: 280rpx; height: 200rpx">
-              <wd-img :width="'100%'" :height="'100%'" radius="20rpx" :src="item.cover" alt="joy" />
+                <wd-img
+                  :width="'100%'"
+                  :height="'100%'"
+                  radius="20rpx"
+                  :src="item.cover"
+                  alt="joy"
+                />
               </view>
               <view class="ps-2 flex-content-column">
                 <view class="ps-1 font-size-3 font-bold ellipsis-2 color-black">
@@ -319,6 +334,7 @@
           </wd-card>
         </view>
       </view>
+    </view>
 
     <view class="p-2">
       <wd-card custom-class="background-none">
@@ -337,8 +353,8 @@
     </view>
     <view class="p-1">
       <wd-row class=" ">
-        <wd-col :span="12" v-for="item in index_live">
-          <view class="p-1">
+        <wd-col :span="12" v-for="(item, index) in index_live">
+          <view class="p-1" v-if="index < 4">
             <view class="py-2" @click="goPage(item)">
               <wd-card custom-class="card-content">
                 <view style="height: 200rpx">
@@ -432,14 +448,14 @@ export default defineComponent({
     },
 
     onChange(e) {
-      console.log(e)
-      this.city = this.swiperList[e.current].city
-      this.title = this.swiperList[e.current].title
+      // // console.log(e)
+      // this.city = this.swiperList[e.current].city
+      // this.title = this.swiperList[e.current].title
     },
 
     changeTab(e) {
-      console.log(e)
-      // this.currentTab = e.id
+      // console.log(e)
+      this.current_item = e
     },
 
     async getArticle() {

src/pages/my/components/wx-login.vue

@@ -172,12 +172,14 @@ import { defineComponent } from 'vue'
 // })
 function more(item) {
   const islogin = hasLogin()
+  // const islogin = true
   if (islogin === false) {
     uni.navigateTo({
       url: '/pages/login/login',
     })
     return
   }
+
   if (islogin === true) {
     // console.log(item)
     if (item.type == 1) {

src/pages/my/setting.vue

@@ -15,7 +15,9 @@
             :value="userInfo.nickname"
             :border="false"
             size="large"
+            is-link
             custom-style="padding:20rpx;font-size:28rpx"
+            @click="showName = true"
           />
           <wd-cell
             icon=""
@@ -51,7 +53,7 @@
           />
         </wd-cell-group>
 
-        <!-- <wd-popup
+        <wd-popup
           v-model="showName"
           position="bottom"
           custom-style="height: 480rpx;padding:20rpx;font-size:28rpx"
@@ -81,7 +83,7 @@
               <text class="color-white font-bold font-size-4 text-shadow">提交修改</text>
             </wd-button>
           </view>
-        </wd-popup> -->
+        </wd-popup>
         <wd-popup
           v-model="showPhone"
           position="bottom"
@@ -174,6 +176,7 @@ import {
   setGroupAPI,
   setPhoneAPI,
   setInfoPI,
+  setBaseAPI,
 } from '@/service/crmeb/product.ts'
 
 export default defineComponent({
@@ -292,24 +295,23 @@ export default defineComponent({
       this.submitGroup()
     },
 
-    // async onSubmitInfo() {
-    //   if (!this.nickname) {
-    //     uni.showToast({
-    //       title: '请填写昵称',
-    //       icon: 'none',
-    //     })
-    //     return
-    //   }
-
-    //   this.userInfo.nickname = this.nickname
-
-    //   const data = {
-    //     nickname: this.nickname,
-    //   }
-    //   const res = await setInfoPI(data)
-    //   console.log(res)
-    //   this.showName = false
-    // },
+    async onSubmitInfo() {
+      if (!this.nickname) {
+        uni.showToast({
+          title: '请填写昵称',
+          icon: 'none',
+        })
+        return
+      }
+      this.userInfo.nickname = this.nickname
+      const data = {
+        nickname: this.nickname,
+        avatar: this.userInfo['avatar'],
+      }
+      const res = await setBaseAPI(data)
+      console.log(res)
+      this.showName = false
+    },
     async onSubmitPhone() {
       if (!this.phone) {
         uni.showToast({

src/service/crmeb/product.ts

@@ -44,6 +44,11 @@ export function setGroupAPI(data: any) {
   return http.post('/api/user/setGroup', data)
 }
 
+//基础修改
+export function setBaseAPI(data: any) {
+  return http.post('/api/user/setBase', data)
+}
+
 export function getCityAPI() {
   return http.get('/api/location/getCity', {})
 }