宋飞扬 1 gadu atpakaļ
vecāks
revīzija
9e04829b45

+ 1 - 1
src/pages.json

@@ -330,7 +330,7 @@
 			{
 			  "path": "tabBar/mine/openStore/messageSubmit",
 			  "style": {
-			    "navigationBarTitleText": "4/4资质信息"
+			    "navigationBarTitleText": "审核信息"
 			  }
 			},
 			{

+ 125 - 121
src/pages/client/clientUser/mine/setting.vue

@@ -1,136 +1,140 @@
 <template>
-	<view class="container">
-		<view class="main-out-box">
-			<view class="main-inner-box">
-				<u-cell-group :border="false">
-					<u-cell size="large" :border="false" icon="account-fill" title="个人信息" isLink
-						url="/pages/client/clientUser/mine/setting/personInfo" />
-					<u-cell size="large" :border="false" icon="fingerprint" title="安全中心" isLink
-						url="/pages/client/clientUser/mine/setting/personInfo" />
-					<u-cell size="large" :border="false" icon="github-circle-fill" title="关于我们" isLink
-						url="/pages/client/clientUser/mine/setting/aboutMine" />
-					<u-cell size="large" :border="false" icon="file-text-fill" title="用户协议" isLink
-						url="/pages/client/clientUser/mine/setting/agreement" />
-					<u-cell size="large" :border="false" icon="file-text" title="隐私政策" isLink
-						url="/pages/client/clientUser/mine/setting/privacyPolicy" />
-					<u-cell icon="integral-fill" title="版本信息" value="V0.0.1" />
-				</u-cell-group>
-			</view>
-		</view>
-		<!-- <SwitchIdentityDialog v-if="showSwitchDialog" @confirm="confirmSwitch" @cancel="cancelSwitch">
-			<p>您确定要从用户/商家端切换到商家段/用户端吗?</p>
-			<br />
-			<br />
-		</SwitchIdentityDialog> -->
-		
-		<view class="policy-out-box">
-			<view class="policy-inner-box">
-				<u-cell-group :border="false">
-					<u-cell size="large" :border="false" icon="level" title="切换身份" isLink @click="showSwitchDialog = true" />
-				</u-cell-group>
-			</view>
-		</view>
-		
-		<u-modal :show="showSwitchDialog" showCancelButton='true' :title="title" :content='content' @confirm='confirmSwitch' @cancel='showSwitchDialog = false'></u-modal>
-		
-		<view class="exit">
-			<u-row class="button">
-				<u-col span="6">
-					<u-button type="info" shape="circle" text="注销账号" :style="{ width: '500rpx' }" />
-				</u-col>
-				<u-col span="6">
-					<u-button type="primary" shape="circle" text="退出登录" :style="{ width: '500rpx' }" />
-				</u-col>
-			</u-row>
-		</view>
-	</view>
-</template>
-
-<script>
-	import SwitchIdentityDialog from '@/components/SwitchIdentityDialog/SwitchIdentityDialog.vue';
+  <view class="container">
+    <view class="main-out-box">
+      <view class="main-inner-box">
+        <u-cell-group :border="false">
+          <u-cell
+            size="large"
+            :border="false"
+            icon="account-fill"
+            title="个人信息"
+            isLink
+            url="/pages/client/clientUser/mine/setting/personInfo"
+          />
+          <u-cell
+            size="large"
+            :border="false"
+            icon="fingerprint"
+            title="安全中心"
+            isLink
+            url="/pages/client/clientUser/mine/setting/personInfo"
+          />
+          <u-cell
+            size="large"
+            :border="false"
+            icon="github-circle-fill"
+            title="关于我们"
+            isLink
+            url="/pages/client/clientUser/mine/setting/aboutMine"
+          />
+          <u-cell
+            size="large"
+            :border="false"
+            icon="file-text-fill"
+            title="用户协议"
+            isLink
+            url="/pages/client/clientUser/mine/setting/agreement"
+          />
+          <u-cell
+            size="large"
+            :border="false"
+            icon="file-text"
+            title="隐私政策"
+            isLink
+            url="/pages/client/clientUser/mine/setting/privacyPolicy"
+          />
+          <u-cell icon="integral-fill" title="版本信息" value="V0.0.1" />
+        </u-cell-group>
+      </view>
+    </view>
 
-	export default {
-		components: {
-			SwitchIdentityDialog,
-		},
-		data() {
-			return {
-				showSwitchDialog: false,
-				title:'标题',
-				content:'您确定要从用户/商家端切换到商家段/用户端吗'
-			};
-		},
+    <view class="policy-out-box">
+      <view class="policy-inner-box">
+        <u-cell-group :border="false">
+          <u-cell
+            size="large"
+            :border="false"
+            icon="level"
+            title="切换身份"
+            isLink
+            @click="showSwitchDialog = true"
+          />
+        </u-cell-group>
+      </view>
+    </view>
 
-		mounted() {},
+    <u-modal
+      :show="showSwitchDialog"
+      showCancelButton="true"
+      :title="title"
+      :content="content"
+      @confirm="confirmSwitch"
+      @cancel="showSwitchDialog = false"
+    ></u-modal>
 
-		methods: {
-			// 获取当前用户信息
-			handlerInitUserMessage() {
-				maintainUserInfo().then(res => {
-					this.user_info = res.data;
-				});
-			},
+    <view class="exit">
+      <u-button type="info" shape="circle" text="注销账号" class="button" />
+      <u-button type="primary" shape="circle" text="退出登录" class="button" />
+    </view>
+  </view>
+</template>
 
-			// 点击跳转到全部订单
-			gotoOrder(item) {
-				uni.navigateTo({
-					url: `/pages/client/clientPackage/orderAll?type=${item.type}`,
-				});
-			},
+<script>
+export default {
+  data() {
+    return {
+      showSwitchDialog: false,
+      title: '提醒',
+      content: '您确定要从用户端切换到商家端吗?',
+    };
+  },
 
-			// 点击跳转到我的收益
-			handlerSkipMyProfit() {
-				uni.navigateTo({
-					url: '/pages/client/clientUser/myProfit',
-				});
-			},
-			confirmSwitch() {
-				// 点击确认切换身份
-				// 处理身份切换逻辑
-				uni.setStorageSync('tabbar_type', false);
-				uni.navigateTo({
-					url: '/pages/merchant/tabBar/mine/index'
-				})
-				// ... 其他操作
-			},
-		},
-	};
+  methods: {
+    confirmSwitch() {
+      uni.setStorageSync('tabbar_type', false);
+      uni.navigateTo({
+        url: '/pages/merchant/tabBar/mine/index',
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.container {
-		min-height: 100vh;
-		background-color: #efefef;
+.container {
+  min-height: 100vh;
+  background-color: #efefef;
 
-		.main-out-box {
-			padding: 20rpx 16rpx;
-			box-sizing: border-box;
+  .main-out-box {
+    padding: 20rpx 16rpx;
+    box-sizing: border-box;
 
-			.main-inner-box {
-				background-color: $uni-bg-color;
-				border-radius: 20rpx;
-			}
-		}
+    .main-inner-box {
+      background-color: $uni-bg-color;
+      border-radius: 20rpx;
+    }
+  }
 
-		.policy-out-box {
-			padding: 50rpx 16rpx;
-			box-sizing: border-box;
+  .policy-out-box {
+    padding: 50rpx 16rpx;
+    box-sizing: border-box;
 
-			.policy-inner-box {
-				background-color: $uni-bg-color;
-				border-radius: 20rpx;
-			}
-		}
-	}
+    .policy-inner-box {
+      background-color: $uni-bg-color;
+      border-radius: 20rpx;
+    }
+  }
+}
 
-	.exit {
-		width: 100%;
-	}
+.exit {
+  width: 100%;
+}
+.button {
+  width: 500rpx;
+  margin-top: 25rpx;
+}
 
-	.button {
-		margin-top: 35rpx;
-		display: flex;
-		justify-content: space-evenly;
-		align-items: center;
-	}
-</style>
+::v-deep .u-modal__title {
+  padding-top: 15px;
+}
+</style>

+ 2 - 2
src/pages/client/tabBar/mine/index.vue

@@ -17,7 +17,7 @@
               <text class="setAuth" @tap="$Router.push('/pages/client/clientUser/mine/setting')">
                 设置
               </text>
-              <text class="setAuth">认证</text>
+              <!-- <text class="setAuth">认证</text> -->
             </view>
           </view>
         </view>
@@ -140,4 +140,4 @@ export default {
 
 <style lang="scss" scoped>
 @import './index.scss';
-</style>
+</style>

+ 62 - 63
src/pages/merchant/tabBar/mine/openStore/index.vue

@@ -6,20 +6,20 @@
       <span class="center-title">你需要准备以下材料:</span>
 
       <view class="content-item-box">
-        <view class="center-item" v-for="(item,index) of centerList">
-          <img class="l-img" src="@/static/logo.png" alt="">
+        <view class="center-item" v-for="(item, index) of centerList">
+          <img class="l-img" src="@/static/logo.png" alt="" />
           <view class="item-r">
-            <p class="r-text1">{{ index+1 }} 、{{ item.title }}</p>
+            <p class="r-text1">{{ index + 1 }} 、{{ item.title }}</p>
             <p class="r-text2">{{ item.content }}</p>
           </view>
         </view>
       </view>
 
       <view class="radoi-box">
-        <u-checkbox-group v-model="checked" >
-          <u-checkbox  shape="circle" name='1' />
+        <u-checkbox-group v-model="checked">
+          <u-checkbox shape="circle" :name="1" />
         </u-checkbox-group>
-        <span>我已阅读并签署 <span style="color: #5992BB;">《开店说明》</span> </span>
+        <span>我已阅读并同意 <span style="color: #5992bb">《开店说明》</span> </span>
       </view>
     </view>
 
@@ -28,92 +28,91 @@
 </template>
 
 <script>
-  import topProcess from "@/pages/merchant/tabBar/mine/openStore/components/top-process.vue"
-  export default{
-    data(){
-      return{
-        centerList:[
-          {
-            img:'',
-            title:'实体店照片',
-            content:'需要提供有完整拍的门店照片和真实的内部环境照片'
-          },
-          {
-            img:'',
-            title:'法人身份证',
-            content:'需要提供营业执照的法人身份证正反面照片'
-          },
-          {
-            img:'',
-            title:'营业执照',
-            content:'需要提供有效的营业执照或监管部门认可的具有与营业执照相同法律效力的其他证件'
-          }
-        ],
-        checked:[]
+import topProcess from '@/pages/merchant/tabBar/mine/openStore/components/top-process.vue';
+export default {
+  data() {
+    return {
+      centerList: [
+        {
+          img: '',
+          title: '实体店照片',
+          content: '需要提供有完整拍的门店照片和真实的内部环境照片',
+        },
+        {
+          img: '',
+          title: '法人身份证',
+          content: '需要提供营业执照的法人身份证正反面照片',
+        },
+        {
+          img: '',
+          title: '营业执照',
+          content: '需要提供有效的营业执照或监管部门认可的具有与营业执照相同法律效力的其他证件',
+        },
+      ],
+      checked: [1],
+    };
+  },
+  components: { topProcess },
+  methods: {
+    // 点击跳转到开店
+    handlerSkipOpenShop() {
+      if (this.checked.length != 0) {
+        uni.navigateTo({
+          url: '/pages/merchant/tabBar/mine/openStore/selectCategory',
+        });
+      } else {
+        uni.showToast({
+          title: '请阅读并同意开店说明',
+          icon: 'none',
+        });
+        return;
       }
     },
-    components:{topProcess},
-    methods:{
-      // 点击跳转到开店
-      handlerSkipOpenShop(){
-        if(this.checked.length != 0){
-          uni.navigateTo({
-            url:'/pages/merchant/tabBar/mine/openStore/selectCategory'
-          })
-        }else{
-          uni.showToast({
-            // title:'请签署开店说明协议',
-            title:'爬',
-            icon:'none'
-          })
-          return
-        }
-      },
-    }
-  }
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-.container{
+.container {
   padding: 20rpx;
-  .center-box{
+  .center-box {
     padding: 20rpx;
     margin-top: 20rpx;
-    .center-item{
+    .center-item {
       display: flex;
       width: 100%;
       margin: 20rpx 0;
-      .l-img{
+      .l-img {
         width: 35%;
         height: 180rpx;
       }
-      .item-r{
+      .item-r {
         margin-left: 50rpx;
         width: 300rpx;
         flex-wrap: wrap;
-        .r-text1{
-
+        .r-text1 {
         }
-        .r-text2{
-          color: #9E9E9E;
-          font-size:24rpx;
+        .r-text2 {
+          color: #9e9e9e;
+          font-size: 24rpx;
           margin-top: 10rpx;
         }
       }
     }
   }
-  .radoi-box{
+  .radoi-box {
     display: flex;
-    color: #9E9E9E;
+    color: #9e9e9e;
     font-size: 26rpx;
     margin-top: 40rpx;
   }
-  .btn{
-    background-color: #5992BB !important;
+  .btn {
+    background-color: #5992bb !important;
     color: #fff;
-    font-size:32rpx;
+    font-size: 32rpx;
     border-radius: 40rpx;
-    margin-top: 40rpx;
+    margin-top: 300rpx;
+    width: 55%;
   }
 }
 </style>

+ 53 - 54
src/pages/merchant/tabBar/mine/openStore/messageSubmit.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="container">
     <view class="top-box">
-      <img class="img" src="@/static/mine/icon_mine_success.png" alt="">
+      <img class="img" src="@/static/mine/icon_mine_success.png" alt="" />
       <p class="top-text">提交成功</p>
     </view>
 
@@ -25,66 +25,65 @@
 </template>
 
 <script>
-  export default{
-    data(){
-      return{
-
-      }
+export default {
+  data() {
+    return {};
+  },
+  methods: {
+    // 点击跳转到开店详情页面
+    handlerSkipComplate() {
+      uni.redirectTo({
+        url: '/pages/merchant/tabBar/mine/openStore/openStoreAppealDetail',
+      });
     },
-    methods:{
-      // 点击跳转到开店详情页面
-      handlerSkipComplate(){
-        uni.redirectTo({
-          url: '/pages/merchant/tabBar/mine/openStore/openStoreAppealDetail'
-        })
-      }
-    }
-  }
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .container{
-    .top-box{
-      text-align: center;
-      margin-top: 100rpx;
-      .img{
-        width: 200rpx;
-        height: 200rpx;
-      }
-      .top-text{
-        font-size:40rpx;
-        font-weight: bold;
-        margin-top: 20rpx;
-      }
+.container {
+  .top-box {
+    text-align: center;
+    margin-top: 100rpx;
+    .img {
+      width: 200rpx;
+      height: 200rpx;
+    }
+    .top-text {
+      font-size: 40rpx;
+      font-weight: bold;
+      margin-top: 20rpx;
     }
+  }
 
-    .content-box{
-      margin: 200rpx auto 50rpx;
-      width: 80%;
-      border-top: 2rpx solid #F3F3F3;
-      border-bottom: 2rpx solid #F3F3F3;
-      padding: 20rpx;
-      .content-item{
-        display: flex;
-        justify-content: space-between;
-        margin: 20rpx 0;
-        font-size:28rpx;
-        .item-l{
-          color: #000;
-        }
-        .item-r{
-          color: #9A9A9A;
-        }
+  .content-box {
+    margin: 200rpx auto 50rpx;
+    width: 80%;
+    border-top: 2rpx solid #f3f3f3;
+    border-bottom: 2rpx solid #f3f3f3;
+    padding: 20rpx;
+    .content-item {
+      display: flex;
+      justify-content: space-between;
+      margin: 20rpx 0;
+      font-size: 28rpx;
+      .item-l {
+        color: #000;
+      }
+      .item-r {
+        color: #9a9a9a;
       }
     }
+  }
 
-    .btn {
-      background-color: #5992BB !important;
-      color: #fff;
-      font-size: 32rpx;
-      border-radius: 40rpx;
-      margin-top: 40rpx;
-      width: 95%;
-    }
+  .btn {
+    background-color: #5992bb !important;
+    color: #fff;
+    font-size: 32rpx;
+    border-radius: 40rpx;
+    margin-top: 40rpx;
+    width: 55%;
   }
-</style>s
+}
+</style>
+s

+ 414 - 364
src/pages/merchant/tabBar/mine/openStore/selectCategory.vue

@@ -1,39 +1,73 @@
 <template>
   <view class="u-wrap">
-
     <view class="top-box">
       <view class="switch-box">
-        <u-tabs :list="list1" lineWidth="30" lineColor="$uni-bg-color-primary" @click='handlerChangeTab' :activeStyle="{
+        <u-tabs
+          :list="list1"
+          lineWidth="30"
+          lineColor="$uni-bg-color-primary"
+          @click="handlerChangeTab"
+          :activeStyle="{
             color: '#000',
             fontSize: '28rpx',
             transform: 'scale(1.05)',
             marginBottom: '15rpx',
-          }" :inactiveStyle="{
+          }"
+          :inactiveStyle="{
             color: '#333',
             fontSize: '30rpx',
             transform: 'scale(1)',
             marginBottom: '15rpx',
-          }" itemStyle="width:50%;padding:0;margin:5px 0;"></u-tabs>
+          }"
+          itemStyle="width:50%;padding:0;margin:5px 0;"
+        ></u-tabs>
       </view>
     </view>
 
     <!-- 在售中 -->
-    <view class="u-menu-wrap" >
-      <scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop"
-        :scroll-into-view="itemId">
-        <view v-for="(item,index) in tabbar" :key="index" class="u-tab-item"
-          :class="[current == index ? 'u-tab-item-active' : '']" @tap.stop="swichMenu(index)">
-          <text class="u-line-1">{{item.name}}</text>
+    <view class="u-menu-wrap">
+      <scroll-view
+        scroll-y
+        scroll-with-animation
+        class="u-tab-view menu-scroll-view"
+        :scroll-top="scrollTop"
+        :scroll-into-view="itemId"
+      >
+        <view
+          v-for="(item, index) in tabbar"
+          :key="index"
+          class="u-tab-item"
+          :class="[current == index ? 'u-tab-item-active' : '']"
+          @tap.stop="swichMenu(index)"
+        >
+          <text class="u-line-1">{{ item.name }}</text>
         </view>
       </scroll-view>
-      <scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll">
+      <scroll-view
+        :scroll-top="scrollRightTop"
+        scroll-y
+        scroll-with-animation
+        class="right-box"
+        @scroll="rightScroll"
+      >
         <view class="page-view">
-          <view class="class-item" :id="'item' + index" v-for="(item , index) in tabbar" :key="index">
+          <view
+            class="class-item"
+            :id="'item' + index"
+            v-for="(item, index) in tabbar"
+            :key="index"
+          >
             <view class="item-title">
-              <text>{{item.name}}</text>
+              <text>{{ item.name }}</text>
             </view>
-            <view class="item-box" >
-              <view class="item"  v-for="(itm,idx) of item.foods" :key="idx" :class="itm.type ? 'act-type' : ''" @click="handlerSelectItem(itm,idx)">
+            <view class="item-box">
+              <view
+                class="item"
+                v-for="(itm, idx) of item.foods"
+                :key="idx"
+                :class="itm.type ? 'act-type' : ''"
+                @click="handlerSelectItem(itm, idx)"
+              >
                 {{ itm.name }}
               </view>
             </view>
@@ -41,126 +75,141 @@
         </view>
       </scroll-view>
     </view>
+
     <button class="btn" @click="handlerSkipNext">下一步</button>
   </view>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        scrollTop: 0, //tab标题的滚动条位置
-        oldScrollTop: 0, // tab标题的滚动条旧位置
-        current: 0, // 预设当前项的值
-        menuHeight: 0, // 左边菜单的高度
-        menuItemHeight: 0, // 左边菜单item的高度
-        itemId: '', // 栏目右边scroll-view用于滚动的id
-        arr: [], // 储存距离顶部高度的数组
-        scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
-        timer: null, // 定时器
-        tabbar: [{
-            "name": "蔬菜水果",
-            "foods": [{
-                "cat": 383,
-                "name": "蔬菜",
-                "icon": "http://nq348.com/uploads/category/20220315/1aeed6fa43b54cd68cce0c4883160f91.png",
-                "key": "蔬菜",
-                "type":false
-              },
-              {
-                "cat": 384,
-                "name": "食用菌",
-                "icon": "http://nq348.com/uploads/category/20220418/09839c618b35b510d50151f9a17793ee.png",
-                "key": "食用菌",
-                "type":false
-              },
-              {
-                "cat": 385,
-                "name": "水果",
-                "icon": "http://nq348.com/uploads/category/20220418/5294ad2fc7effc9629cbfdb8baf41773.png",
-                "key": "水果",
-                "type":false
-              }
-            ]
-          },
-          {
-            "name": "其他",
-            "foods": [{
-                "cat": 434,
-                "name": "包装",
-                "icon": "http://nq348.com/uploads/category/20220418/ebdfd326333344825adbe81dbd89e2c9.png",
-                "key": "包装",
-                "type":false
-              },
-              {
-                "cat": 435,
-                "name": "安全溯源",
-                "icon": "http://nq348.com/uploads/category/20220418/03230c63f066f46005abf5f576df0ed1.png",
-                "key": "安全溯源",
-                "type":false
-              },
-              {
-                "cat": 436,
-                "name": "农用百货",
-                "icon": "http://nq348.com/uploads/category/20220418/93393f2df3264faba86bb449a0c10a79.png",
-                "key": "农用百货",
-                "type":false
-              },
-              {
-                "cat": 437,
-                "name": "仓储物流",
-                "icon": "http://nq348.com/uploads/category/20220418/f553505ebabbcb1bf762b288716cf1e7.png",
-                "key": "仓储物流",
-                "type":false
-              }
-            ]
-          }
-        ],
-        list1: [{
+export default {
+  data() {
+    return {
+      scrollTop: 0, //tab标题的滚动条位置
+      oldScrollTop: 0, // tab标题的滚动条旧位置
+      current: 0, // 预设当前项的值
+      menuHeight: 0, // 左边菜单的高度
+      menuItemHeight: 0, // 左边菜单item的高度
+      itemId: '', // 栏目右边scroll-view用于滚动的id
+      arr: [], // 储存距离顶部高度的数组
+      scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
+      timer: null, // 定时器
+      tabbar: [
+        {
+          name: '蔬菜水果',
+          foods: [
+            {
+              cat: 383,
+              name: '蔬菜',
+              icon: 'http://nq348.com/uploads/category/20220315/1aeed6fa43b54cd68cce0c4883160f91.png',
+              key: '蔬菜',
+              type: false,
+            },
+            {
+              cat: 384,
+              name: '食用菌',
+              icon: 'http://nq348.com/uploads/category/20220418/09839c618b35b510d50151f9a17793ee.png',
+              key: '食用菌',
+              type: false,
+            },
+            {
+              cat: 385,
+              name: '水果',
+              icon: 'http://nq348.com/uploads/category/20220418/5294ad2fc7effc9629cbfdb8baf41773.png',
+              key: '水果',
+              type: false,
+            },
+          ],
+        },
+        {
+          name: '其他',
+          foods: [
+            {
+              cat: 434,
+              name: '包装',
+              icon: 'http://nq348.com/uploads/category/20220418/ebdfd326333344825adbe81dbd89e2c9.png',
+              key: '包装',
+              type: false,
+            },
+            {
+              cat: 435,
+              name: '安全溯源',
+              icon: 'http://nq348.com/uploads/category/20220418/03230c63f066f46005abf5f576df0ed1.png',
+              key: '安全溯源',
+              type: false,
+            },
+            {
+              cat: 436,
+              name: '农用百货',
+              icon: 'http://nq348.com/uploads/category/20220418/93393f2df3264faba86bb449a0c10a79.png',
+              key: '农用百货',
+              type: false,
+            },
+            {
+              cat: 437,
+              name: '仓储物流',
+              icon: 'http://nq348.com/uploads/category/20220418/f553505ebabbcb1bf762b288716cf1e7.png',
+              key: '仓储物流',
+              type: false,
+            },
+          ],
+        },
+      ],
+      list1: [
+        {
           name: '主营服务',
-        }, {
+        },
+        {
           name: '辅盈服务(选填)',
-        }],
-      }
+        },
+      ],
+    };
+  },
+  /**
+   * 获取一个目标元素的高度
+   * @elClass 元素的类名
+   * @dataVal 储存高度的对象
+   */
+  onReady() {
+    this.getMenuItemTop();
+  },
+  watch: {
+    delete_type(newValue) {
+      this.scrollRightTop = 0;
+      this.current = 0;
     },
-    /**
-     * 获取一个目标元素的高度
-     * @elClass 元素的类名
-     * @dataVal 储存高度的对象
-     */
-    onReady() {
-      this.getMenuItemTop()
-    },
-    watch: {
-      delete_type(newValue) {
-        this.scrollRightTop = 0
-        this.current = 0
-      }
+  },
+  methods: {
+    getElRect(elClass, dataVal) {
+      new Promise((resolve, reject) => {
+        const query = uni.createSelectorQuery().in(this);
+        query
+          .select('.' + elClass)
+          .fields(
+            {
+              size: true,
+            },
+            res => {
+              // 如果节点尚未生成,res值为null,循环调用执行
+              if (!res) {
+                setTimeout(() => {
+                  this.getElRect(elClass);
+                }, 10);
+                return;
+              }
+              this[dataVal] = res.height;
+              resolve();
+            },
+          )
+          .exec();
+      });
     },
-    methods: {
-      getElRect(elClass, dataVal) {
-        new Promise((resolve, reject) => {
-          const query = uni.createSelectorQuery().in(this);
-          query.select('.' + elClass).fields({
-            size: true
-          }, res => {
-            // 如果节点尚未生成,res值为null,循环调用执行
-            if (!res) {
-              setTimeout(() => {
-                this.getElRect(elClass);
-              }, 10);
-              return;
-            }
-            this[dataVal] = res.height;
-            resolve();
-          }).exec();
-        })
-      },
 
-      getMenuItemTop() {
-        new Promise(resolve => {
-          let selectorQuery = uni.createSelectorQuery();
-          selectorQuery.selectAll('.class-item').boundingClientRect((rects) => {
+    getMenuItemTop() {
+      new Promise(resolve => {
+        let selectorQuery = uni.createSelectorQuery();
+        selectorQuery
+          .selectAll('.class-item')
+          .boundingClientRect(rects => {
             // 如果节点尚未生成,rects值为[](因为用selectAll,所以返回的是数组),循环调用执行
             if (!rects.length) {
               setTimeout(() => {
@@ -168,281 +217,282 @@
               }, 10);
               return;
             }
-            rects.forEach((rect) => {
+            rects.forEach(rect => {
               // 视情况而定,这里减去rects[0].top,是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
               this.arr.push(rect.top - rects[0].top);
               // this.arr.push(rect.top)
               resolve();
-            })
-          }).exec()
-        })
-      },
-      /**
-       * 观测元素相交状态
-       * 检测右边scroll-view的id为itemxx的元素与right-box的相交状态
-       * 如果跟.right-box底部相交,就动态设置左边栏目的活动状态
-       */
-      async observer() {
-        this.tabbar.map((val, index) => {
-          let observer = uni.createIntersectionObserver(this);
-          observer.relativeTo('.right-box', {
-            top: 0
-          }).observe('#item' + index, res => {
+            });
+          })
+          .exec();
+      });
+    },
+    /**
+     * 观测元素相交状态
+     * 检测右边scroll-view的id为itemxx的元素与right-box的相交状态
+     * 如果跟.right-box底部相交,就动态设置左边栏目的活动状态
+     */
+    async observer() {
+      this.tabbar.map((val, index) => {
+        let observer = uni.createIntersectionObserver(this);
+        observer
+          .relativeTo('.right-box', {
+            top: 0,
+          })
+          .observe('#item' + index, res => {
             if (res.intersectionRatio > 0) {
               let id = res.id.substring(4);
               this.leftMenuStatus(id);
             }
-          })
-        })
-      },
-      /**
-       * 设置左边菜单的滚动状态
-       * @index 传入的 ID
-       */
-      async leftMenuStatus(index) {
+          });
+      });
+    },
+    /**
+     * 设置左边菜单的滚动状态
+     * @index 传入的 ID
+     */
+    async leftMenuStatus(index) {
+      this.current = index;
+      // 如果为0,意味着尚未初始化
+      if (this.menuHeight == 0 || this.menuItemHeight == 0) {
+        await this.getElRect('menu-scroll-view', 'menuHeight');
+        await this.getElRect('u-tab-item', 'menuItemHeight');
+      }
+      // 将菜单活动item垂直居中
+      this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
+    },
+    /**
+     * 点击左边的栏目切换
+     * @index 传入的 ID
+     */
+    async swichMenu(index) {
+      if (this.arr.length == 0) {
+        await this.getMenuItemTop();
+      }
+      if (index == this.current) return;
+      this.scrollRightTop = this.oldScrollTop;
+      this.$nextTick(function () {
+        this.scrollRightTop = this.arr[index];
         this.current = index;
-        // 如果为0,意味着尚未初始化
-        if (this.menuHeight == 0 || this.menuItemHeight == 0) {
-          await this.getElRect('menu-scroll-view', 'menuHeight');
-          await this.getElRect('u-tab-item', 'menuItemHeight');
-        }
-        // 将菜单活动item垂直居中
-        this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
-      },
-      /**
-       * 点击左边的栏目切换
-       * @index 传入的 ID
-       */
-      async swichMenu(index) {
-        if (this.arr.length == 0) {
-          await this.getMenuItemTop();
-        }
-        if (index == this.current) return;
-        this.scrollRightTop = this.oldScrollTop;
-        this.$nextTick(function() {
-          this.scrollRightTop = this.arr[index];
-          this.current = index;
-          this.leftMenuStatus(index);
-        })
-      },
-      /**
-       * 右边菜单滚动
-       * 如果不存在height2,意味着数据循环已经到了最后一个,设置左边菜单为最后一项即可
-       */
-      async rightScroll(e) {
-        this.oldScrollTop = e.detail.scrollTop;
-        if (this.arr.length == 0) {
-          await this.getMenuItemTop();
-        }
-        if (this.timer) return;
-        if (!this.menuHeight) {
-          await this.getElRect('menu-scroll-view', 'menuHeight');
-        }
-        setTimeout(() => { // 节流
-          this.timer = null;
-          // scrollHeight为右边菜单垂直中点位置
-          // let scrollHeight = e.detail.scrollTop + this.menuHeight / 2;
-          // scrollHeight为右边菜单头部位置
-          let scrollHeight = e.detail.scrollTop + 20;
-          for (let i = 0; i < this.arr.length; i++) {
-            let height1 = this.arr[i];
-            let height2 = this.arr[i + 1];
-            if (!height2 || scrollHeight >= height1 && scrollHeight < height2) {
-              this.leftMenuStatus(i);
-              return;
-            }
+        this.leftMenuStatus(index);
+      });
+    },
+    /**
+     * 右边菜单滚动
+     * 如果不存在height2,意味着数据循环已经到了最后一个,设置左边菜单为最后一项即可
+     */
+    async rightScroll(e) {
+      this.oldScrollTop = e.detail.scrollTop;
+      if (this.arr.length == 0) {
+        await this.getMenuItemTop();
+      }
+      if (this.timer) return;
+      if (!this.menuHeight) {
+        await this.getElRect('menu-scroll-view', 'menuHeight');
+      }
+      setTimeout(() => {
+        // 节流
+        this.timer = null;
+        // scrollHeight为右边菜单垂直中点位置
+        // let scrollHeight = e.detail.scrollTop + this.menuHeight / 2;
+        // scrollHeight为右边菜单头部位置
+        let scrollHeight = e.detail.scrollTop + 20;
+        for (let i = 0; i < this.arr.length; i++) {
+          let height1 = this.arr[i];
+          let height2 = this.arr[i + 1];
+          if (!height2 || (scrollHeight >= height1 && scrollHeight < height2)) {
+            this.leftMenuStatus(i);
+            return;
           }
-        }, 10)
-      },
-
-      // 搜索按钮
-      handlerSearchBtn() {
-        console.log('search', this.search);
-      },
-      // 切换tab
-      handlerChangeTab(e) {
-        if (e.index == 1) {
-          this.delete_type = true
-        } else {
-          this.delete_type = false
         }
-      },
-      // 选择类型
-      handlerSelectItem(itm,idx){
-        console.log('itm',itm,idx);
-        itm.type = !itm.type
-      },
-      // 跳转到下一步
-      handlerSkipNext(){
-        uni.navigateTo({
-          url:'pages/merchant/tabBar/mine/openStore/storeInformation'
-        })
-      }
-    }
+      }, 10);
+    },
 
-  }
+    // 搜索按钮
+    handlerSearchBtn() {
+      console.log('search', this.search);
+    },
+    // 切换tab
+    handlerChangeTab(e) {
+      if (e.index == 1) {
+        this.delete_type = true;
+      } else {
+        this.delete_type = false;
+      }
+    },
+    // 选择类型
+    handlerSelectItem(itm, idx) {
+      console.log('itm', itm, idx);
+      itm.type = !itm.type;
+    },
+    // 跳转到下一步
+    handlerSkipNext() {
+      uni.navigateTo({
+        url: 'pages/merchant/tabBar/mine/openStore/storeInformation',
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .top-box {
-    padding: 0 0 20rpx;
-    width: 100%;
+.top-box {
+  padding: 0 0 20rpx;
+  width: 100%;
 
-    .switch-box {
-      width: 100%;
-    }
+  .switch-box {
+    width: 100%;
+  }
 
-    .search-box {
-      display: flex;
-      justify-content: space-around;
-      width: 90%;
-      margin: 20rpx auto 0;
+  .search-box {
+    display: flex;
+    justify-content: space-around;
+    width: 90%;
+    margin: 20rpx auto 0;
 
-      .btn {
-        width: 160rpx;
-        height: 70rpx;
-        background-color: #5992BB;
-        color: #fff;
-        text-align: center;
-        line-height: 70rpx;
-        font-size: 26rpx;
-        border-radius: 30rpx;
-        margin-left: 20rpx;
-      }
+    .btn {
+      width: 160rpx;
+      height: 70rpx;
+      background-color: #5992bb;
+      color: #fff;
+      text-align: center;
+      line-height: 70rpx;
+      font-size: 26rpx;
+      border-radius: 30rpx;
+      margin-left: 20rpx;
     }
   }
+}
 
-  .u-wrap {
-    /* #ifdef H5 */
-    height: calc(100vh - var(--window-top));
-    /* #endif */
-    display: flex;
-    flex-direction: column;
-    height: 100vh;
-    background-color: #FAFAFA;
-  }
+.u-wrap {
+  /* #ifdef H5 */
+  height: calc(100vh - var(--window-top));
+  /* #endif */
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  background-color: #fafafa;
+}
 
-  .u-search-box {
-    padding: 18rpx 30rpx;
-  }
+.u-search-box {
+  padding: 18rpx 30rpx;
+}
 
-  .u-menu-wrap {
-    flex: 1;
-    display: flex;
-    overflow: hidden;
-  }
+.u-menu-wrap {
+  flex: 0.93;
+  display: flex;
+  overflow: hidden;
+}
 
-  .u-tab-view {
-    width: 200rpx;
-    background-color: #f6f6f6;
-  }
+.u-tab-view {
+  width: 200rpx;
+  background-color: #f6f6f6;
+}
 
-  .u-tab-item {
-    height: 110rpx;
-    background: #f6f6f6;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 26rpx;
-    color: #444;
-    font-weight: 400;
-    line-height: 1;
-    padding: 16rpx 0;
+.u-tab-item {
+  height: 110rpx;
+  background: #f6f6f6;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 26rpx;
+  color: #444;
+  font-weight: 400;
+  line-height: 1;
+  padding: 16rpx 0;
+}
 
-  }
+.u-tab-item-active {
+  position: relative;
+  color: #5f96be;
+  font-size: 30rpx;
+  font-weight: 500;
+  background: #fff;
+}
 
-  .u-tab-item-active {
-    position: relative;
-    color: #5F96BE;
-    font-size: 30rpx;
-    font-weight: 500;
-    background: #FFF;
-  }
+.u-tab-item-active::before {
+  content: '';
+  position: absolute;
+  border-left: 4px solid #5f96be;
+  height: 52rpx;
+  left: 0;
+  top: 29rpx;
+}
 
-  .u-tab-item-active::before {
-    content: "";
-    position: absolute;
-    border-left: 4px solid #5F96BE;
-    height: 52rpx;
-    left: 0;
-    top: 29rpx;
-  }
+.u-tab-view {
+  height: 100%;
+}
 
-  .u-tab-view {
-    height: 100%;
-  }
+.right-box {
+  background-color: rgb(250, 250, 250);
+}
 
-  .right-box {
-    background-color: rgb(250, 250, 250);
-  }
+.page-view {
+  padding: 16rpx;
+}
 
-  .page-view {
-    padding: 16rpx;
-  }
+.class-item,
+.class-item2 {
+  margin-bottom: 30rpx;
+  background-color: #fff;
+  padding: 16rpx;
+  border-radius: 8rpx;
+}
 
-  .class-item,
-  .class-item2 {
-    margin-bottom: 30rpx;
-    background-color: #fff;
-    padding: 16rpx;
-    border-radius: 8rpx;
-  }
+.class-item2 {
+  margin-bottom: 0;
+}
 
-  .class-item2 {
-    margin-bottom: 0;
-  }
+.item-title {
+  font-size: 26rpx;
+  text-align: center;
+  color: #5f96be;
+  margin-bottom: 20rpx;
+}
 
-  .item-title {
-    font-size: 26rpx;
+.item-box {
+  display: grid;
+  grid-template-columns: 30% 30% 30%;
+  justify-content: space-between;
+  .item {
+    margin-bottom: 10rpx;
+    background-color: #edebeb;
+    color: #000;
+    padding: 10rpx;
     text-align: center;
-    color: #5F96BE;
-    margin-bottom: 20rpx;
+    border-radius: 10rpx;
   }
-
-  .item-box {
-    display: grid;
-    grid-template-columns: 30% 30% 30%;
-    justify-content: space-between;
-    .item{
-      margin-bottom: 10rpx;
-      background-color: #EDEBEB;
-      color:#000;
-      padding: 10rpx;
-      text-align: center;
-      border-radius: 10rpx;
-    }
-    .act-type{
-      border: 2rpx solid #5992BB !important;
-      color: #5992BB !important;
-    }
+  .act-type {
+    border: 2rpx solid #5992bb !important;
+    color: #5992bb !important;
   }
+}
 
-  .bottom-box {
-    width: 100%;
-    background-color: #fff;
-    padding: 10rpx 20rpx;
-    height: 100rpx;
-    border-top: 2rpx solid #F7F7F7;
-    box-shadow: 0px 7px 10px 7px rgba(0, 0, 0, 0.1);
-    display: flex;
-    justify-content: space-around;
-    line-height: 100rpx;
-    font-size: 28rpx;
-
-  }
-  .btn {
-    background-color: #5992BB !important;
-    color: #fff;
-    font-size: 32rpx;
-    border-radius: 40rpx;
-    margin-bottom: 40rpx;
-    width: 95%;
-  }
-  ::v-deep .u-input--radius.data-v-fdbb9fe6,
-  .u-input--square.data-v-fdbb9fe6 {
-    background-color: #F7F7F7 !important;
-    padding: 40rpx;
-    border-radius: 50rpx;
-  }
+.bottom-box {
+  width: 100%;
+  background-color: #fff;
+  padding: 10rpx 20rpx;
+  height: 100rpx;
+  border-top: 2rpx solid #f7f7f7;
+  box-shadow: 0px 7px 10px 7px rgba(0, 0, 0, 0.1);
+  display: flex;
+  justify-content: space-around;
+  line-height: 100rpx;
+  font-size: 28rpx;
+}
+.btn {
+  background-color: #5992bb !important;
+  color: #fff;
+  font-size: 32rpx;
+  border-radius: 40rpx;
+  margin-bottom: 40rpx;
+  width: 55%;
+}
+::v-deep .u-input--radius.data-v-fdbb9fe6,
+.u-input--square.data-v-fdbb9fe6 {
+  background-color: #f7f7f7 !important;
+  padding: 40rpx;
+  border-radius: 50rpx;
+}
 </style>

+ 119 - 100
src/pages/merchant/tabBar/mine/openStore/storeInformation.vue

@@ -13,7 +13,12 @@
       <view class="content-item">
         <view class="item-l"> 手机号码 </view>
         <view class="item-r">
-          <u--input placeholder="请输入手机号码" border="surround" v-model="value" type='number'></u--input>
+          <u--input
+            placeholder="请输入手机号码"
+            border="surround"
+            v-model="value"
+            type="number"
+          ></u--input>
         </view>
       </view>
     </view>
@@ -22,8 +27,13 @@
         <view class="item-l"> 主营服务 </view>
         <view class="item-r">
           <!-- <u--input placeholder="请选择主营服务" border="surround" suffixIcon="arrow-right" v-model="value" ></u--input> 111-->
-          <uni-data-select class="data_select" placeholder="请选择主营服务" v-model="value1" :localdata="range"
-            @change="change"></uni-data-select>
+          <uni-data-select
+            class="data_select"
+            placeholder="请选择主营服务"
+            v-model="value1"
+            :localdata="range"
+            @change="change"
+          ></uni-data-select>
           <u-icon name="arrow-right" color="#97989A" size="18"></u-icon>
         </view>
       </view>
@@ -32,8 +42,13 @@
         <view class="item-r">
           <!-- <u--input placeholder="请选择辅营服务" border="surround" suffixIcon="arrow-right" v-model="value"
             ></u--input> -->
-          <uni-data-select class="data_select" placeholder="请选择辅营服务" v-model="value1" :localdata="range"
-            @change="change"></uni-data-select>
+          <uni-data-select
+            class="data_select"
+            placeholder="请选择辅营服务"
+            v-model="value1"
+            :localdata="range"
+            @change="change"
+          ></uni-data-select>
           <u-icon name="arrow-right" color="#97989A" size="18"></u-icon>
         </view>
       </view>
@@ -43,143 +58,147 @@
       <view class="content-item">
         <view class="item-l"> 店铺名称 </view>
         <view class="item-r">
-          <u--input placeholder="请输入店铺名称" border="surround" v-model="value" ></u--input>
+          <u--input placeholder="请输入店铺名称" border="surround" v-model="value"></u--input>
         </view>
       </view>
       <view class="content-item">
         <view class="item-l"> 所在地 </view>
         <view class="item-r">
-          <u--input placeholder="请选择所在地" border="surround" suffixIcon="arrow-right" v-model="value"
-           ></u--input>
+          <u--input
+            placeholder="请选择所在地"
+            border="surround"
+            suffixIcon="arrow-right"
+            v-model="value"
+          ></u--input>
         </view>
       </view>
       <view class="content-item">
         <view class="item-l"> 详细地址 </view>
         <view class="item-r">
-          <u--input placeholder="请输入门店详细地址" border="surround" v-model="value" ></u--input>
+          <u--input placeholder="请输入门店详细地址" border="surround" v-model="value"></u--input>
         </view>
       </view>
     </view>
 
     <view class="content-box">
       <imgs-upload :filelist.sync="filelist"></imgs-upload>
-      <p class='upload-text'>店铺门面图(需要包含完整牌匾)</p>
+      <p class="upload-text">店铺门面图(需要包含完整牌匾)</p>
     </view>
 
     <view class="content-box">
       <imgs-upload :filelist.sync="filelist"></imgs-upload>
-      <p class='upload-text'>店内真实环境图</p>
+      <p class="upload-text">店内真实环境图</p>
     </view>
 
-
     <button class="btn" @click="handlerSkipNext">下一步</button>
   </view>
 </template>
 
 <script>
-  import ImgsUpload from "@/pages/merchant/tabBar/mine/openStore/components/ImgsUpload.vue"
-  export default {
-    data() {
-      return {
-        value: '',
-        value1: -1,
-        range: [{
-            value: 0,
-            text: "篮球"
-          },
-          {
-            value: 1,
-            text: "足球"
-          },
-          {
-            value: 2,
-            text: "游泳"
-          },
-        ],
-        filelist: [],
-      }
+import ImgsUpload from '@/pages/merchant/tabBar/mine/openStore/components/ImgsUpload.vue';
+export default {
+  data() {
+    return {
+      value: '',
+      value1: -1,
+      range: [
+        {
+          value: 0,
+          text: '篮球',
+        },
+        {
+          value: 1,
+          text: '足球',
+        },
+        {
+          value: 2,
+          text: '游泳',
+        },
+      ],
+      filelist: [],
+    };
+  },
+  components: { ImgsUpload },
+  methods: {
+    // 跳转到3/4法人信息
+    handlerSkipNext() {
+      uni.navigateTo({
+        url: '/pages/merchant/tabBar/mine/openStore/corporateInformation',
+      });
     },
-    components:{ImgsUpload},
-    methods: {
-      // 跳转到3/4法人信息
-      handlerSkipNext() {
-        uni.navigateTo({
-          url: '/pages/merchant/tabBar/mine/openStore/corporateInformation'
-        })
-      },
-      change(e) {
-        console.log("e:", e);
-      },
-    }
-  }
+    change(e) {
+      console.log('e:', e);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .container {
-    background-color: #F7F7F7 !important;
-    padding-bottom: 40rpx;
-    .top-box {
-      color: #666666;
-      font-size: 26rpx;
-      text-align: center;
-      padding: 20rpx 40rpx;
-      background-color: #fff;
-    }
+.container {
+  background-color: #f7f7f7 !important;
+  padding-bottom: 40rpx;
+  .top-box {
+    color: #666666;
+    font-size: 26rpx;
+    text-align: center;
+    padding: 20rpx 40rpx;
+    background-color: #fff;
+  }
 
-    .content-box {
-      padding: 20rpx 40rpx;
-      background-color: #fff;
-      margin: 10rpx 0;
+  .content-box {
+    padding: 20rpx 40rpx;
+    background-color: #fff;
+    margin: 10rpx 0;
 
-      .content-item {
-        display: flex;
-        align-items: center;
-        justify-content: space-around;
-        width: 100%;
-        margin: 20rpx 0;
+    .content-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      width: 100%;
+      margin: 20rpx 0;
 
-        .item-l {
-          width: 30%;
-        }
+      .item-l {
+        width: 30%;
+      }
 
-        .item-r {
-          width: 70%;
-          background-color: #F7F7F7;
-          border-radius: 20rpx;
-          display: flex;
+      .item-r {
+        width: 70%;
+        background-color: #f7f7f7;
+        border-radius: 20rpx;
+        display: flex;
 
-          .data_select {
-            width: 90%;
-          }
+        .data_select {
+          width: 90%;
         }
-
-      }
-      .upload-text{
-        text-align: center;
-        color: #666666;
-        font-size:28rpx;
-        margin-top: 20rpx;
       }
     }
-
-    .btn {
-      background-color: #5992BB !important;
-      color: #fff;
-      font-size: 32rpx;
-      border-radius: 40rpx;
-      margin-top: 40rpx;
-      width: 95%;
+    .upload-text {
+      text-align: center;
+      color: #666666;
+      font-size: 28rpx;
+      margin-top: 20rpx;
     }
   }
 
-  ::v-deep .u-input__content__field-wrapper__field.data-v-fdbb9fe6 {}
-
-  ::v-deep .uni-select {
-    border: none !important;
+  .btn {
+    background-color: #5992bb !important;
+    color: #fff;
+    font-size: 32rpx;
+    border-radius: 40rpx;
+    margin-top: 40rpx;
+    width: 95%;
   }
+}
 
-  ::v-deep .uni-select__input-placeholder {
-    font-size: 28rpx !important;
-    color: #CBCED4 !important;
-  }
+::v-deep .u-input__content__field-wrapper__field.data-v-fdbb9fe6 {
+}
+
+::v-deep .uni-select {
+  border: none !important;
+}
+
+::v-deep .uni-select__input-placeholder {
+  font-size: 28rpx !important;
+  color: #cbced4 !important;
+}
 </style>

+ 124 - 106
src/pages/merchant/tabBar/mine/setting/index.vue

@@ -10,28 +10,33 @@
     </view>
 
     <view class="item-content">
-      <view class="item-box">
+      <!-- <view class="item-box">
         <view class="item-l"> 新消息通知 </view> 
         <view class="item-r">
           <u-switch v-model="value" activeColor="#5992BB"></u-switch>
         </view>
-      </view>
+      </view> -->
       <view class="item-box">
-        <view class="item-l"> 隐私管理 </view>
+        <view class="item-l"> 隐私政策 </view>
         <view class="item-r">
           <u-icon name="arrow-right" color="#C0C0C0" :size="icon_size"></u-icon>
         </view>
       </view>
-      <view class="item-box">
+      <!-- <view class="item-box">
         <view class="item-l"> 选择语言 </view>
         <view class="item-r">
           <p>简体中文</p><u-icon name="arrow-right" color="#C0C0C0" :size="icon_size"></u-icon>
         </view>
-      </view>
+      </view> -->
     </view>
 
     <view class="item-content">
-      <view class="item-box" v-for="(item,index) of privacy_list" :key="item.id" @click="handlerSkipPrivacy(item)">
+      <view
+        class="item-box"
+        v-for="(item, index) of privacy_list"
+        :key="item.id"
+        @click="handlerSkipPrivacy(item)"
+      >
         <view class="item-l"> {{ item.name }} </view>
         <view class="item-r">
           <u-icon name="arrow-right" color="#C0C0C0" :size="icon_size"></u-icon>
@@ -40,121 +45,134 @@
     </view>
 
     <view class="btn-box">
-      <button class='btn1' @click="showSwitchDialog = true">切换账号</button>
-      <button class='btn2' @click="loginout_show = true">退出登录</button>
+      <button class="btn1" @click="showSwitchDialog = true">切换账号</button>
+      <button class="btn2" @click="loginout_show = true">退出登录</button>
     </view>
-	<u-modal :show="showSwitchDialog" showCancelButton='true' :title="title" :content='content' @confirm='confirmSwitch' @cancel='showSwitchDialog = false'></u-modal>
-    <u-modal :show="loginout_show" :content='content' showCancelButton='true' @confirm='handlerLoginOutConfirm' @cancel='loginout_show = false'></u-modal>
+    <u-modal
+      :show="showSwitchDialog"
+      showCancelButton="true"
+      :title="title"
+      :content="content"
+      @confirm="confirmSwitch"
+      @cancel="showSwitchDialog = false"
+    ></u-modal>
+    <u-modal
+      :show="loginout_show"
+      :content="content"
+      showCancelButton="true"
+      @confirm="handlerLoginOutConfirm"
+      @cancel="loginout_show = false"
+    ></u-modal>
   </view>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        value: true,
-        icon_size: 18,
-        loginout_show:false,
-        content:'退出后店铺状态将变更为休息中,是否退出当前帐号',
-        privacy_list:[
-          {
-            name:'应用权限说明',
-            id:0
-          },
-          {
-            name:'个人信息收集清单',
-            id:1
-          },
-          {
-            name:'第三方共享个人信息清单',
-            id:2
-          },
-          {
-            name:'关于我们',
-            id:3
-          }
-        ],
-		showSwitchDialog:false
-      }
-    },
-    methods:{
-      // 点击切换账号
-      // handlerSwitchAccount(){
+export default {
+  data() {
+    return {
+      value: true,
+      icon_size: 18,
+      loginout_show: false,
+      content: '退出后店铺状态将变更为休息中,是否退出当前帐号',
+      privacy_list: [
+        {
+          name: '应用权限说明',
+          id: 0,
+        },
+        {
+          name: '个人信息收集清单',
+          id: 1,
+        },
+        {
+          name: '第三方共享个人信息清单',
+          id: 2,
+        },
+        {
+          name: '关于我们',
+          id: 3,
+        },
+      ],
+      showSwitchDialog: false,
+    };
+  },
+  methods: {
+    // 点击切换账号
+    // handlerSwitchAccount(){
 
-      // },
-	  confirmSwitch() {
-	  	// 点击确认切换身份
-	  	// 处理身份切换逻辑
-	  	uni.setStorageSync('tabbar_type', true);
-	  	uni.switchTab({
-	  		url: '/pages/client/tabBar/mine/index'
-	  	})
-	  	// ... 其他操作
-	  },
-      // 跳转到账号与安全
-      handlerSkipAccountSafety(){
-        uni.navigateTo({
-          url:`/pages/tabBar/mine/setting/accountSafety`
-        })
-      },
-      // 点击跳转到隐私页面
-      handlerSkipPrivacy(item){
-        uni.navigateTo({
-          url:`/pages/tabBar/mine/setting/privacyPolicy?type=${item.id}`
-        })
-      },
-      //点击退出登录
-       handlerLoginOutConfirm(){
-          this.loginout_show = false
-       }
-    }
-  }
+    // },
+    confirmSwitch() {
+      // 点击确认切换身份
+      // 处理身份切换逻辑
+      uni.setStorageSync('tabbar_type', true);
+      uni.switchTab({
+        url: '/pages/client/tabBar/mine/index',
+      });
+      // ... 其他操作
+    },
+    // 跳转到账号与安全
+    handlerSkipAccountSafety() {
+      uni.navigateTo({
+        url: `/pages/tabBar/mine/setting/accountSafety`,
+      });
+    },
+    // 点击跳转到隐私页面
+    handlerSkipPrivacy(item) {
+      uni.navigateTo({
+        url: `/pages/tabBar/mine/setting/privacyPolicy?type=${item.id}`,
+      });
+    },
+    //点击退出登录
+    handlerLoginOutConfirm() {
+      this.loginout_show = false;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .container {
-    background-color: #F5F5F5;
-    min-height: calc(100vh - 40rpx);
-    padding-top: 40rpx;
+.container {
+  background-color: #f5f5f5;
+  min-height: calc(100vh - 40rpx);
+  padding-top: 40rpx;
 
-    .item-content {
-      margin-bottom: 40rpx;
+  .item-content {
+    margin-bottom: 40rpx;
 
-      .item-box {
-        display: flex;
-        justify-content: space-between;
-        background-color: #fff;
-        padding: 20rpx 40rpx;
-        font-size: 30rpx;
+    .item-box {
+      display: flex;
+      justify-content: space-between;
+      background-color: #fff;
+      padding: 20rpx 40rpx;
+      font-size: 30rpx;
 
-        .item-r {
-          display: flex;
-          font-size: 26rpx;
-          color: #B0B0B0;
-        }
+      .item-r {
+        display: flex;
+        font-size: 26rpx;
+        color: #b0b0b0;
       }
     }
-
   }
-  .btn-box{
-    width: 90%;
-    margin: 200rpx auto 0;
-    .btn1,.btn2{
-      padding: 20rpx;
-      height: 80rpx;
-      font-size:28rpx;
-      line-height: 40rpx;
-    }
-    .btn1{
-      background-color: #5992BB;
-      color: #000;
-    }
-    .btn2{
-      margin-top: 50rpx;
-      background-color: #E2E2E2;
-    }
+}
+.btn-box {
+  width: 90%;
+  margin: 200rpx auto 0;
+  .btn1,
+  .btn2 {
+    padding: 20rpx;
+    height: 80rpx;
+    font-size: 28rpx;
+    line-height: 40rpx;
+  }
+  .btn1 {
+    background-color: #5992bb;
+    color: #000;
   }
-  ::v-deep .u-modal__content__text.data-v-713d0fd3 {
-    text-align: center;
+  .btn2 {
+    margin-top: 50rpx;
+    background-color: #e2e2e2;
   }
+}
+::v-deep .u-modal__content__text.data-v-713d0fd3 {
+  text-align: center;
+}
 </style>