Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into old

pages.json

@@ -217,6 +217,15 @@
 						"navigationStyle": "custom"
 					}
 
+				}, {
+					"path": "supply_chain/maps",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "",
+						"navigationBarBackgroundColor": "#e93323",
+						"navigationStyle": "custom"
+					}
+
 				}, {
 					"path": "supply_chain/merchant",
 					"style": {

pages/nongKe/supply_chain/maps.vue

@@ -0,0 +1,22 @@
+<template>
+	<view class="">
+		<map :class="mapClass" id="map" :enable-zoom="true" :scale="19" :latitude="28.908447" :enable-scroll="true"
+			:longitude="105.439304" style="width: 100vw;height: 100vh;">
+			<!-- <cover-image class="map_btn" @tap="test" src="../../static/img/logistics/DH.png">
+			</cover-image> -->
+		</map>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

pages/nongKe/supply_chain/supplierA.vue

@@ -8,14 +8,14 @@
 					<view class="back" @click='backjJump()'>
 						<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
 					</view>
-					<view class="">
+					<view style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
-						{{storeList[0].mer_info}}
+						{{titName}}
 					</view>
 					<view style="position: relative;">
 						<!-- <text class='iconfont icon-sousuo'></text>
 			<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
 				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
-						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称或区域"
+						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
 							v-model="sotreParam.keyword" class="serch_cls"></u-search>
 						<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;"
 							:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
@@ -30,7 +30,7 @@
 					<text>热搜sasas商品</text> -->
 				</view>
 
-				<view class="menu_cls">
+				<!-- <view class="menu_cls">
 					<u-scroll-list>
 						<view class="menu_li" @click="navGo(item.merchant_category_id)" v-for="item,index in menuList"
 							:key="index">
@@ -39,8 +39,8 @@
 							<text style="display: block;    width: 15vw;">{{item.category_name}}</text>
 						</view>
 					</u-scroll-list>
-				</view>
+				</view> -->
-				</u-scroll-list>
+
 				<view class="goods_list">
 					<view class="goods_card" @click="goStore(item.mer_id)" v-for="(item,index) in storeList"
 						:key="index">
@@ -293,6 +293,7 @@
 		},
 		data() {
 			return {
+				titName: "",
 				imgList: [
 					"/static/images/GXSC/BBY.png",
 					"/static/images/GXSC/JYPX.png",
@@ -385,6 +386,7 @@
 			this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
 			this.sotreParam.category_id = options.merchant_category_id || ''
 			this.storeList = [];
+
 			if (this.mer_location == 1) {
 				this.selfLocation()
 			}
@@ -602,6 +604,7 @@
 					this.storeList = this.storeList.concat(res.data.list)
 					this.loading = false
 					this.loadingIcon = false
+					this.titName = this.storeList[0].mer_info
 				})
 			},
 			// 进店
@@ -721,14 +724,15 @@
 	.com_name {
 		font-size: 32rpx;
 		// background-color: red;
-		max-width: 40vw;
+
 		white-space: nowrap;
 		/* 防止文字换行 */
 		overflow: hidden;
 		/* 超出部分隐藏 */
 		text-overflow: ellipsis;
+		max-width: 45vw;
 		/* 使用省略号表示溢出的内容 */
-		width: 200px;
+
 		/* 可根据实际情况调整容器宽度 */
 	}
 
@@ -741,8 +745,9 @@
 		// padding: 0 20rpx 0;
 
 		.top {
-			padding-top: 20rpx;
+			// padding-top: var(--status-bar-height);
-			background-color: white;
+			padding-top: 80rpx;
+			background-color: #F0F2F5;
 			position: fixed;
 			z-index: 999;
 			width: 100%;

pages/supply_chains/supply_chains.vue

@@ -315,6 +315,13 @@
 				this.isFshow = true
 
 
+
+			} else if (e.scrollTop == 0) {
+				this.ishshow = false
+				this.isFshow = false
+			} else {
+				this.ishshow = false
+				this.isFshow = false
 			}
 		},
 		// #endif

pages/user/index.vue

@@ -21,8 +21,9 @@
 					<view class="bg"></view>
 					<view class="user-info">
 						<view class="avatar-box" :class="{on:userInfo.is_svip > 0 && svip_switch_status == 1}">
-              <image class="avatar skeleton-radius" :src="userInfo.avatar ? userInfo.avatar : '/static/images/f.png'"
+							<image class="avatar skeleton-radius"
-                @click="goEdit"></image>
+								:src="userInfo.avatar ? userInfo.avatar : '/static/images/f.png'" @click="goEdit">
+							</image>
 							<view class="headwear" v-if="userInfo.is_svip > 0 && svip_switch_status == 1">
 								<image src="/static/images/headwear.png"></image>
 							</view>
@@ -81,7 +82,8 @@
 					</view>
 					<navigator hover-class="none"
 						:url="userInfo.is_svip > 0 ? '/pages/annex/vip_center/index' : '/pages/annex/vip_paid/index'"
-            class="cardVipA acea-row row-between-wrapper" v-if="userInfo.svip_open && svip_switch_status == 1">
+						class="cardVipA acea-row row-between-wrapper"
+						v-if="userInfo.svip_open && svip_switch_status == 1">
 						<image class="svip_user" src="/static/images/svip_user.png"></image>
 						<view class="left-box">
 							<view v-if="userInfo.is_svip > 0" class="small">累计为您节省{{userInfo.svip_save_money}}元</view>
@@ -105,7 +107,8 @@
 				<view class="order-wrapper">
 					<view class="order-hd flex skeleton-rect">
 						<view class="left">我的订单</view>
-            <view class="right flex" @click="authTo('/pages/users/order_list/index?status=-1&product_type=0')" hover-class="none"
+						<view class="right flex"
+							@click="authTo('/pages/users/order_list/index?status=-1&product_type=0')" hover-class="none"
 							open-type="navigate">
 							全部订单
 							<text class="iconfont icon-xiangyou"></text>
@@ -233,19 +236,33 @@
 <script>
 	let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-  import { getMenuList, getUserInfo, setVisit } from '@/api/user.js';
+	import {
-  import { getVersion } from "@/api/public";
+		getMenuList,
-  import { orderData } from '@/api/order.js'
+		getUserInfo,
-  import { mapGetters } from "vuex";
+		setVisit
+	} from '@/api/user.js';
+	import {
+		getVersion
+	} from "@/api/public";
+	import {
+		orderData
+	} from '@/api/order.js'
+	import {
+		mapGetters
+	} from "vuex";
 	import authorize from '@/components/Authorize';
 	import dayjs from '@/plugin/dayjs/dayjs.min.js';
 	import Cache from '@/utils/cache';
 	// #ifndef H5
 	import passwordPopup from '@/components/passwordPopup';
 	// #endif
-  import { configMap } from '@/utils';
+	import {
+		configMap
+	} from '@/utils';
 	import Auth from '../../libs/wechat';
-  import { HTTP_REQUEST_URL } from '@/config/app';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
 	const app = getApp();
 	export default {
 		components: {
@@ -309,22 +326,72 @@
 						num: 0
 					},
 				],
-        imgUrls: [{ url: '', pic: '' }],
+				imgUrls: [{
+					url: '',
+					pic: ''
+				}],
 				userMenu: [],
 				skeletonMenu: [],
-        personalMenu: [
+				personalMenu: [{
-          { pic: '', name: '', isShow: true },
+						pic: '',
-          { pic: '', name: '', isShow: true },
+						name: '',
-          { pic: '', name: '', isShow: true },
+						isShow: true
-          { pic: '', name: '', isShow: true },
+					},
-          { pic: '', name: '', isShow: true },
+					{
-          { pic: '', name: '', isShow: true },
+						pic: '',
-          { pic: '', name: '', isShow: true },
+						name: '',
-          { pic: '', name: '', isShow: true },
+						isShow: true
-          { pic: '', name: '', isShow: true },
+					},
-          { pic: '', name: '', isShow: true },
+					{
-          { pic: '', name: '', isShow: true },
+						pic: '',
-          { pic: '', name: '', isShow: true }
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					},
+					{
+						pic: '',
+						name: '',
+						isShow: true
+					}
 				],
 				autoplay: true,
 				circular: true,
@@ -333,7 +400,9 @@
 				isAuto: false, //没有授权的不会自动授权
 				isShowAuth: false, //是否隐藏授权
 				orderStatusNum: {},
-        userInfo: { aratar: '/static/f.png' },
+				userInfo: {
+					aratar: '/static/f.png'
+				},
 				MyMenus: [],
 				is_promoter: 0, //推广人开关  1开
 				extension_status: 0,
@@ -423,8 +492,7 @@
 				if (item.url == '/pages/users/user_money/index') {
 					// item.isShow = that.balance_func_status == 1
 					item.isShow = true
-		}
+				} else if (item.url == '/pages/users/user_spread_user/index') {
-        else if (item.url == '/pages/users/user_spread_user/index') {
 					if (that.extension_status == 0) {
 						item.isShow = false
 					} else if (that.extension_status == 1) {