mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

供销综合云市场页面修改

Browse Source
This commit is contained in:
THK3121 2023-09-02 18:46:04 +08:00
parent ec4b8582da
commit 6daa2e75ec
17 changed files with 1362 additions and 1238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pages.json
View File

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

22
pages/nongKe/supply_chain/maps.vue Normal file
View File

@ -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>

60
pages/nongKe/supply_chain/supplier.vue
View File

@ -1,6 +1,6 @@
<template>
<view style="background-color: #F0F2F5;min-height: 100vh">
<view style="height: var(--status-bar-height);"></view>
<view style="background-color: #F0F2F5;">
<!-- <view style="height: var(--status-bar-height);background-color: red;height: 10vh;">dsfdsfsdfds</view> -->
<view class='productList' :style="viewColor">
<!-- 顶部 -->
<view class="top">
@ -8,7 +8,7 @@
<view class="back" @click='backjJump()'>
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
</view>
<view class="">
<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
供销综合云市场
</view>
<view style="position: relative;width: 289.14rpx;">
@ -21,7 +21,7 @@
:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
height="56.82rpx"></u--image>
</view>
<view class='iconfont search-right' @click='showMaoLocation(latitude,longitude)'>
<view class='iconfont search-right' @click="goMap('/pages/nongKe/supply_chain/maps')">
<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="50.82rpx"
height="50.82rpx"></u--image>
</view>
@ -34,18 +34,18 @@
</view>
<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">
<!-- {{item.merchant_category_id}} -->
<u--image :showLoading="true" :src="imgList[index]" width="94.63rpx" height="99.63rpx"
style="margin-bottom: 20rpx;"></u--image>
<text style="display: block; width: 15vw;">{{item.category_name}}</text>
<text
style="display: block;font-size: 26.29rpx; width: 15vw;">{{item.category_name}}</text>
</view>
</u-scroll-list>
</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">
@ -57,13 +57,13 @@
<view class="li head">
<text class="com_name">{{item.mer_name}}</text>
<text
style="font-weight: normal; font-size: 10rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
style="font-weight: normal;font-size: 19.28rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
</view>
<view class="li">
<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
<text style="margin-left: 20rpx;color: #FF6D20; ">5.0</text>
<text>月销2000+</text>
<text>月销{{item.sales}}</text>
</view>
<view class="li" style="align-items: center;">
<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
@ -299,10 +299,22 @@
return {
imgList: [
"/static/images/GXSC/BBY.png",
"/static/images/GXSC/JYPX.png",
"/static/images/GXSC/NFCP.png",
"/static/images/GXSC/NYSC.png",
"/static/images/GXSC/SHFW.png",
"/static/images/GXSC/SCFW.png",
"/static/images/GXSC/BBY.png",
"/static/images/GXSC/NFCP.png",
"/static/images/GXSC/WLSY.png",
"/static/images/GXSC/WYLY.png",
"/static/images/GXSC/MSGY.png",
"/static/images/GXSC/YLBJ.png",
"/static/images/GXSC/JYPX.png",
"/static/images/GXSC/JJRB.png",
"/static/images/GXSC/ZXJZ.png",
"/static/images/GXSC/NMJD.png",
"/static/images/GXSC/GXZH.png",
"/static/images/GXSC/DFTC.png",
"/static/images/GXSC/JDMS.png",
],
@ -418,6 +430,11 @@
}, mapGetters(['viewColor'])),
},
methods: {
goMap(url) {
uni.navigateTo({
url
})
},
navGo(id) {
uni.navigateTo({
url: `/pages/nongKe/supply_chain/supplierA?type_id=10&merchant_category_id=${id}`
@ -720,16 +737,16 @@
}
.com_name {
font-size: 32rpx;
font-size: 33.29rpx;
// background-color: red;
max-width: 40vw;
max-width: 45vw;
white-space: nowrap;
/* 防止文字换行 */
overflow: hidden;
/* 超出部分隐藏 */
text-overflow: ellipsis;
/* 使用省略号表示溢出的内容 */
width: 200px;
// width: 200px;
/* 可根据实际情况调整容器宽度 */
}
@ -738,8 +755,9 @@
// padding: 0 20rpx 0;
.top {
padding-top: 20rpx;
background-color: white;
// padding-top: var(--status-bar-height);
padding-top: 80rpx;
background-color: #F0F2F5;
position: fixed;
z-index: 999;
width: 100%;
@ -790,12 +808,13 @@
.right {
.head {
font-weight: bold;
// color: red;
}
.li {
display: flex;
font-size: 22rpx;
font-size: 26.29rpx;
margin-bottom: 10rpx;
align-items: center;
@ -847,10 +866,11 @@
color: #B3B3B3;
display: flex;
justify-content: space-around;
margin: 20rpx 0;
margin-top: 40rpx;
flex-wrap: wrap;
// margin-top: 50rpx;
padding-top: 50rpx;
padding-top: 100rpx;
text {
margin: 10rpx;

25
pages/nongKe/supply_chain/supplierA.vue
View File

@ -8,14 +8,14 @@
<view class="back" @click='backjJump()'>
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
</view>
<view class="">
{{storeList[0].mer_info}}
<view style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
{{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>
</u-scroll-list>
</view> -->
<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;
background-color: white;
// padding-top: var(--status-bar-height);
padding-top: 80rpx;
background-color: #F0F2F5;
position: fixed;
z-index: 999;
width: 100%;

122
pages/user/index.vue
View File

@ -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'"
@click="goEdit"></image>
<image class="avatar skeleton-radius"
: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 { getVersion } from "@/api/public";
import { orderData } from '@/api/order.js'
import { mapGetters } from "vuex";
import {
getMenuList,
getUserInfo,
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: [
{ 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 },
{ pic: '', name: '', isShow: true },
{ pic: '', name: '', isShow: true },
{ pic: '', name: '', isShow: true }
personalMenu: [{
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
},
{
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) {

BIN
static/images/GXSC/JJRB.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 36 KiB

BIN
static/images/GXSC/JYPX.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 36 KiB

BIN
static/images/GXSC/MSGY.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
static/images/GXSC/NMJD.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
static/images/GXSC/NYSC.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 35 KiB

BIN
static/images/GXSC/SCFW.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
static/images/GXSC/SHFW.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
static/images/GXSC/WLSY.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
static/images/GXSC/WYLY.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 37 KiB

BIN
static/images/GXSC/YLBJ.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
static/images/GXSC/ZXJZ.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB