From 3b8cdb773a53dedb513aab4da741e9dac90c55fa Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 13 Sep 2023 10:47:29 +0800
Subject: [PATCH 01/26] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E5=93=81?=
=?UTF-8?q?=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/product/list/index.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 766a9e0..052a999 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -312,6 +312,7 @@
},
yinc() {
+
this.$set(this, 'num', -1);
},
menuAction(action, rowId, item, index) {
From 4988185c0c1cec6d35ea224bcd3384f241d3ae5a Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 13 Sep 2023 11:15:24 +0800
Subject: [PATCH 02/26] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/product/list/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 4cace44..1e4f763 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -113,7 +113,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/components/mentioned.vue b/components/mentioned.vue
index b0a0814..12f0495 100644
--- a/components/mentioned.vue
+++ b/components/mentioned.vue
@@ -18,28 +18,33 @@
￥{{item.spu && item.spu.price}}
立即购买
-
+
-
+
-
-
+
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/components/plantConSwiper/index.vue b/components/plantConSwiper/index.vue
index ea15751..b1a9da0 100644
--- a/components/plantConSwiper/index.vue
+++ b/components/plantConSwiper/index.vue
@@ -1,8 +1,8 @@
-
+ :interval="interval" :duration="duration">
+
@@ -12,7 +12,7 @@
-
+
@@ -56,8 +56,7 @@
videoContext: ''
};
},
- created() {
- },
+ created() {},
watch: {
},
@@ -83,7 +82,7 @@
// #ifdef APP-PLUS
this.isPlay = false
this.videoContext = uni.createVideoContext('myVideo', this);
- this.$nextTick(()=>{
+ this.$nextTick(() => {
this.videoContext.play();
})
// #endif
@@ -102,13 +101,15 @@
height: 710rpx;
position: relative;
}
+
.product-bg swiper {
width: 100%;
height: 100%;
position: relative;
}
+
.product-bg .slide-image {
- width: 100%;
+ width: 100vw;
height: 100%;
border-radius: 16rpx;
}
@@ -166,4 +167,4 @@
width: 100%;
height: 100%;
}
-
+
\ No newline at end of file
diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue
index 8dea21b..1b8648d 100644
--- a/components/zbpSwiper.vue
+++ b/components/zbpSwiper.vue
@@ -142,10 +142,12 @@
this.$emit('change', e)
this.street = e.value[1].name
this.$nextTick(() => {
- this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code);
-
+ this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
})
-
+
+
+
},
changeHandler(e) {
const {
diff --git a/components/zbpSwiperb.vue b/components/zbpSwiperb.vue
new file mode 100644
index 0000000..d0949dc
--- /dev/null
+++ b/components/zbpSwiperb.vue
@@ -0,0 +1,353 @@
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ {{street}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8e86578..79ab2dc 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -252,9 +252,7 @@
mounted() {
this.getUserInfo()
- uni.onNetworkStatusChange((res) => {
- console.log(res, res.networkType)
- });
+
this.selfLocation()
// #ifdef H5
// 监听页面滚动事件
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index afb0697..9abc0b4 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -177,7 +177,6 @@
height="400.09rpx">
暂无商品
-
@@ -244,17 +243,84 @@
+
+
+
+
- 暂无商家
-
+ 当前区域暂无云仓
-
+
+
+
+
+
+
+
+
+
+
+
+
+ fsdfsdfsdfffffffff
+
+
+
+ 79.00
+
+
+ 库存:999
+
+
+
+
+
+
+
+
+ 尺码
+
+
+ 大号
+
+
+
+
+ 数量
+
+
+
+
+
+
+
+ 加入购物车
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -266,7 +332,7 @@
import {
cloudWarehouse,
getCityCloundShop
- } from '@/api/api.js'
+ } from '@/api/requesta.js'
import {
Toast
} from '@/libs/uniApi';
@@ -284,17 +350,26 @@
import {
postCartAdd,
} from '@/api/store.js';
+ import authorize from '@/components/Authorize';
+ import {
+ mapGetters
+ } from "vuex";
export default {
+ components: {
+ authorize,
+ },
data() {
let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
return {
+ skuNumber: 0,
+ showcartpop: false,
trnList: [],
act_cart: false,
appInfo: {},
pocls: "",
type: "",
act_swiper: "",
- current: 1,
+ current: 3,
goodsNum: 0,
goodsList: [],
isEmpty: false,
@@ -315,6 +390,7 @@
page_num: 1,
act_img: "",
cartTagInfo: {},
+ isAuto: false,
actList: [{
tit: '综合',
act: "",
@@ -331,11 +407,16 @@
}],
status: "loadmore",
flag: false,
+ isShowAuth: false, //是否隐藏授权
}
},
+ computed: {
+ ...mapGetters(['isLogin', 'viewColor', 'uid']),
+ },
+ // ...mapGetters(['isLogin', 'viewColor', 'uid']),
onLoad(e) {
- this.cartFn()
+ // this.cartFn()
this.appInfo = this.$appInfo.safeAreaInsets
this.winHeight = this.$appInfo.windowHeight
this.street_code = e.street
@@ -346,6 +427,7 @@
onShow() {
this.cartFn()
},
+
// 分页
onReachBottom() {
if (this.flag || !this.goodsList.length) return
@@ -364,6 +446,12 @@
if (res.data.list[0].product_id == this.goodsList[0].product_id) {
this.status = "nomore"
this.flag = false
+ } else {
+ if (res.data.list.length == 0) {
+ this.status = "nomore"
+ return
+ }
+ this.goodsList = this.goodsList.concat(res.data.list)
}
})
// this.getList().then(res => {
@@ -427,6 +515,23 @@
// },
methods: {
+ valChange(e) {
+ this.valChange = e
+ },
+ closecartpop() {
+ this.showcartpop = false
+ },
+ opencartpop() {
+ this.showcartpop = true
+ },
+ // 授权关闭
+ authColse: function(e) {
+ this.isShowAuth = e;
+ },
+
+ onLoadFun() {
+ this.isShowAuth = false;
+ },
clickSwiperFn(i) {
// console.log(i)
this.current = i
@@ -521,6 +626,14 @@
},
addcart(item, i) {
+ // this.showcartpop = true
+ // return
+ // console.log(this.isLogin)
+ if (!this.isLogin) {
+ this.isAuto = true;
+ this.isShowAuth = true
+ return
+ }
let data = {
cart_num: 1,
@@ -628,6 +741,39 @@
}
}
+ .sku {
+ padding: 20rpx;
+
+ .sku_head {
+ display: flex;
+
+ .sku_head_r {
+ margin-left: 20rpx;
+ display: flex;
+ justify-content: space-between;
+ flex-direction: column;
+ }
+
+ // justify-content;
+ }
+
+ .sku_num {
+ display: flex;
+ justify-content: space-between;
+ }
+
+ .skuaddcart {
+ width: 50vw;
+ background-color: #FEAB00;
+ margin: 0 auto;
+ height: 80rpx;
+ line-height: 80rpx;
+ text-align: center;
+ color: white;
+ border-radius: 80rpx;
+ }
+ }
+
.flags {
background-color: red;
z-index: 99999999;
@@ -951,7 +1097,7 @@
.card {
width: 720rpx;
- z-index: 999999;
+ z-index: 99;
// margin:auto;
left: 50%;
transform: translateX(-50%);
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 8e24527..1a8578b 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -37,7 +37,7 @@
- asdasd
+
热搜: 小张副食
+
@@ -202,7 +202,8 @@
暂无评论，快去抢沙发吧~
-
+
{{followDetail.count_start}}
-
+
{{replyData.all}}
-
+
- 商品 (2)
+ 商品 ({{followDetail.relevance.length}})
@@ -265,8 +267,8 @@
-
+
@@ -275,10 +277,15 @@
-
+
@@ -336,6 +343,7 @@
},
data() {
return {
+ flag: false,
open_grass: openPlantGrass,
followDetail: null,
commList: [], //评论列表
@@ -400,7 +408,7 @@
},
FToggle() {
this.$refs.bindmobile1.open()
-
+
},
// 后退
returns() {
@@ -712,10 +720,12 @@
/*查看提到的宝贝*/
openMore(item) {
this.$refs.mentioned.showPopup()
+ this.flag = true
},
close() {
this.$refs.mentioned.closePopup()
this.$refs.bindmobile.close()
+ this.flag = false
}
},
onReachBottom() {
@@ -1280,28 +1290,30 @@
font-size: 32rpx;
}
}
-.input_count1{
-
- height: 70rpx;
- padding-top: 15rpx;
-
-
- /deep/.count1{
- padding-left: 20rpx;
- width: 617rpx;
+
+ .input_count1 {
+
height: 70rpx;
- background: #F4F4F4;
- margin: 0 auto;
-
- border-radius: 35px 35px 35px 35px;
+ padding-top: 15rpx;
+
+
+ /deep/.count1 {
+ padding-left: 20rpx;
+ width: 617rpx;
+ height: 70rpx;
+ background: #F4F4F4;
+ margin: 0 auto;
+
+ border-radius: 35px 35px 35px 35px;
+ }
+
}
-}
.release_bar {
align-items: center;
width: 100%;
background: #ffffff;
-
+
padding: 15rpx 20rpx;
position: fixed;
left: 0;
@@ -1403,4 +1415,24 @@
font-size: 26rpx;
}
}
+
+ .send1 {
+ font-size: 26rpx;
+ color: #ffffff;
+ // padding: 12rpx 45rpx;
+ background-image: linear-gradient(126deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+ border-radius: 30rpx;
+ text-align: center;
+ width: 150rpx;
+ line-height: 70rpx;
+ margin-left: 20rpx;
+
+ // height: ;
+ }
+
+ // 禁止滚动
+ .off_scoll {
+ height: 100vh;
+ overflow: hidden;
+ }
\ No newline at end of file
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index bf98155..4a62a93 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -102,6 +102,19 @@
+
+
+
+
+ 社会信用代码
+
+
+
+
+
+
-
- ￥{{storeInfo.price}}
- ￥{{storeInfo.ot_price}}
-
- ￥{{storeInfo.svip_price}}
-
-
-
-
-
-
-
- {{storeInfo.merchant.type_name}}
- 自营
- {{storeInfo.store_name}}
-
-
-
- 分享
-
-
-
- 积分最高可抵扣{{storeInfo.max_integral}}元
- 包邮
-
-
-
-
- ￥
- {{storeInfo.price}}
-
- ￥{{storeInfo.svip_price}}
-
-
-
-
-
- 分享
-
-
-
-
-
- 开通 SVIP会员 立省{{svipData.save_money}}元
-
-
- 立即开通
-
-
-
-
- 积分最高可抵扣{{storeInfo.max_integral}}元
- 包邮
-
-
- {{storeInfo.merchant.type_name}}
- 自营
- {{storeInfo.store_name || ''}}
-
-
- 市场价:￥{{storeInfo.ot_price ? storeInfo.ot_price : ''}}
-
- 库存:{{storeInfo.stock ? storeInfo.stock : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}
-
- 销量:{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}
-
-
-
-
-
- {{ storeInfo.top_name }} · 第{{ storeInfo.top_num }}名
-
-
-
-
-
-
- 优惠券：
-
- 满{{item.use_min_price}}减{{item.coupon_price}}
-
-
-
-
-
- {{attrTxt}}：
- {{attrValue}}
-
-
-
-
-
- 参数：
-
- {{item.name}}
- ...
-
-
-
-
-
-
- 运费：
- {{shippingValue}}
-
-
-
-
-
- 保障：
-
-
- {{item.guarantee_name ? item.guarantee_name : ''}}
-
-
-
-
-
-
-
-
-
- 优惠套餐({{comboTotal}})
-
- 查看全部
-
-
-
-
-
-
-
-
-
-
-
- 共{{item.count}}件
- 省 ¥{{item.max_price}}
-
-
-
-
-
-
-
- 用户评价({{replyCount}})
-
- {{replyChance}}好评率
-
-
-
-
-
-
-
-
-
-
- 种草秀
-
- 查看全部
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}
-
- {{storeInfo.merchant.type_name}}
- 自营
-
-
- {{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
-
- 0人关注
-
- 进店
-
-
-
- 商品描述{{storeInfo.merchant.product_score}}
-
-
- 卖家服务{{storeInfo.merchant.service_score}}
-
-
- 物流服务{{storeInfo.merchant.postage_score}}
-
-
-
-
- 店铺推荐
-
-
-
-
-
-
- {{item.store_name}}
-
- ￥{{item.price}}
-
-
-
-
-
-
-
-
- 产品介绍
-
-
-
-
-
-
-
-
-
- {{description.content.title}}
-
-
-
-
-
-
-
-
- {{priceRule.rule_name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 分享给好友
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保存到手机
-
-
- 长按图片可以保存到手机
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{storeInfo.price}}
+ ￥{{storeInfo.ot_price}}
+
+ ￥{{storeInfo.svip_price}}
+
+
+
+
+
+
+
+ {{storeInfo.merchant.type_name}}
+ 自营
+ {{storeInfo.store_name}}
+
+
+
+ 分享
+
+
+
+ 积分最高可抵扣{{storeInfo.max_integral}}元
+ 包邮
+
+
+
+
+ ￥
+ {{storeInfo.price}}
+
+ ￥{{storeInfo.svip_price}}
+
+
+
+
+
+ 分享
+
+
+
+
+
+ 开通 SVIP会员 立省{{svipData.save_money}}元
+
+
+ 立即开通
+
+
+
+
+ 积分最高可抵扣{{storeInfo.max_integral}}元
+ 包邮
+
+
+ {{storeInfo.merchant.type_name}}
+ 自营
+ {{storeInfo.store_name || ''}}
+
+
+ 市场价:￥{{storeInfo.ot_price ? storeInfo.ot_price : ''}}
+
+ 库存:{{storeInfo.stock ? storeInfo.stock : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}
+
+
+ 销量:{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}
+
+
+
+
+
+
+ {{ storeInfo.top_name }} · 第{{ storeInfo.top_num }}名
+
+
+
+
+
+
+ 优惠券：
+
+ 满{{item.use_min_price}}减{{item.coupon_price}}
+
+
+
+
+
+ {{attrTxt}}：
+ {{attrValue}}
+
+
+
+
+
+ 参数：
+
+ {{item.name}}
+ ...
+
+
+
+
+
+
+ 运费：
+ {{shippingValue}}
+
+
+
+
+
+ 保障：
+
+
+ {{item.guarantee_name ? item.guarantee_name : ''}}
+
+
+
+
+
+
+
+
+
+ 优惠套餐({{comboTotal}})
+
+ 查看全部
+
+
+
+
+
+
+
+
+
+
+
+ 共{{item.count}}件
+ 省 ¥{{item.max_price}}
+
+
+
+
+
+
+
+ 用户评价({{replyCount}})
+
+ {{replyChance}}好评率
+
+
+
+
+
+
+
+
+
+
+ 种草秀
+
+ 查看全部
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}
+
+ {{storeInfo.merchant.type_name}}
+ 自营
+
+
+ {{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
+
+ 0人关注
+
+ 进店
+
+
+
+ 商品描述{{storeInfo.merchant.product_score}}
+
+
+ 卖家服务{{storeInfo.merchant.service_score}}
+
+
+ 物流服务{{storeInfo.merchant.postage_score}}
+
+
+
+
+ 店铺推荐
+
+
+
+
+
+
+ {{item.store_name}}
+
+ ￥{{item.price}}
+
+
+
+
+
+
+
+
+ 产品介绍
+
+
+
+
+
+
+
+
+
+ {{description.content.title}}
+
+
+
+
+
+
+
+
+
+ {{priceRule.rule_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 分享给好友
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存到手机
+
+
+ 长按图片可以保存到手机
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 79ab2dc..6cf4a98 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -220,13 +220,11 @@
},
onTabItemTap(e) {
-
uni.pageScrollTo({
selector: ".Circle_friends",
scrollTop: 0
})
-
},
onHide() {
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 9abc0b4..5793877 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -265,19 +265,19 @@
-
- fsdfsdfsdfffffffff
+ {{skuform.store_info}}
- 79.00
+ ￥ {{skuform.price}}
-
- 库存:999
+
+ 库存:{{skuform.sku[this.skusize].stock}}
@@ -285,11 +285,14 @@
-
+
尺码
- 大号
+ {{item.sku}}
+
+
@@ -300,9 +303,9 @@
-
+
- 加入购物车
+ 确定
@@ -343,7 +346,7 @@
getCartCounts,
getCartList,
- } from '@/api/order.js';
+ } from '@/api/requesta.js';
import {
goShopDetail
} from '@/libs/order.js'
@@ -361,7 +364,12 @@
data() {
let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
return {
- skuNumber: 0,
+ skuform: {
+
+
+ },
+ skusize: 0,
+ skuNumber: 1,
showcartpop: false,
trnList: [],
act_cart: false,
@@ -427,7 +435,6 @@
onShow() {
this.cartFn()
},
-
// 分页
onReachBottom() {
if (this.flag || !this.goodsList.length) return
@@ -515,8 +522,41 @@
// },
methods: {
+ skusizechange(i) {
+
+ this.skusize = i
+ },
+ skuaddcart() {
+ this.showcartpop = false
+ // this.skuform = {}
+ let res = postCartAdd({
+ cart_num: this.skuNumber,
+ is_new: 0,
+ product_attr_unique: this.skuform.sku[this.skusize].unique,
+ product_id: this.skuform.product_id,
+ product_type: this.skuform.product_type,
+ spread_id: "",
+ }).then((res, err) => {
+ this.cartFn()
+ uni.showToast({
+ title: "加入成功",
+ duration: 1000,
+
+ })
+ }).catch(err => {
+ // this.act_cart = false
+ uni.showToast({
+ title: err,
+ icon: "none",
+ duration: 1000,
+ })
+ })
+
+ },
valChange(e) {
- this.valChange = e
+ console.log(e.value)
+ this.skuNumber = e.value
+ // this.valChange = e.value
},
closecartpop() {
this.showcartpop = false
@@ -626,69 +666,74 @@
},
addcart(item, i) {
- // this.showcartpop = true
- // return
+
// console.log(this.isLogin)
if (!this.isLogin) {
this.isAuto = true;
this.isShowAuth = true
return
}
+ // console.log(item.sku[''] ? "1" : "2")
+ if (item.sku['']) {
+ let data = {
+ cart_num: 1,
+ is_new: 0,
+ product_attr_unique: item.sku[''].unique,
+ product_id: item.product_id,
+ product_type: item.product_type,
+ spread_id: "",
+ }
- let data = {
- cart_num: 1,
- is_new: 0,
- product_attr_unique: item.sku[''].unique,
- product_id: item.product_id,
- product_type: item.product_type,
- spread_id: "",
+ let that = this
+ // return
+
+ uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
+ that.trnList[i].left = this.cartTagInfo.left - data1.left;
+ that.trnList[i].bottom = this.cartTagInfo.top - data1.top;
+ console.log(that.trnList[i])
+ let timer = setTimeout(() => {
+ that.trnList[i].left = 0
+ that.trnList[i].bottom = 0
+ that.act_cart = true
+ setTimeout(() => {
+ that.act_cart = false
+ }, 500)
+ }, 1000)
+ }).exec();
+ let res = postCartAdd({
+ ...data
+ }).then((res, err) => {
+ this.cartFn()
+ uni.showToast({
+ title: "加入成功",
+ duration: 1000,
+
+ })
+ }).catch(err => {
+ // this.act_cart = false
+ uni.showToast({
+ title: err,
+ icon: "none",
+ duration: 1000,
+ })
+ })
+ setTimeout(() => {
+ that.act_cart = false
+ }, 500)
+ } else {
+ this.skuform = item
+ this.showcartpop = true
+ const keys = Object.keys(item.sku);
+ const firstKey = keys[0];
+
+
+ // console.log(keys[0])
+ this.skusize = keys[0]
+ // console.log(this.skuform)
}
-
- let that = this
- // return
-
- uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
- that.trnList[i].left = this.cartTagInfo.left - data1.left;
- that.trnList[i].bottom = this.cartTagInfo.top - data1.top;
- console.log(that.trnList[i])
- let timer = setTimeout(() => {
- that.trnList[i].left = 0
- that.trnList[i].bottom = 0
- that.act_cart = true
- setTimeout(() => {
- that.act_cart = false
- }, 500)
- }, 1000)
- }).exec();
- let res = postCartAdd({
- ...data
- }).then((res, err) => {
- this.cartFn()
- uni.showToast({
- title: "加入成功",
- duration: 1000,
-
- })
- }).catch(err => {
- // this.act_cart = false
- uni.showToast({
- title: err,
- icon: "none",
- duration: 1000,
- })
- })
- setTimeout(() => {
- that.act_cart = false
- }, 500)
- // let that = this
- // uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
- // that.trnList[i].left = this.cartTagInfo.left - data1.left + 'px';
- // that.trnList[i].bottom = this.cartTagInfo.top - data1.top + 'px';
- // console.log(that.trnList[i])
+ return
- // }).exec();
- // this.tot_price += Number(price)
},
all(index) {
this.showPop = false
@@ -752,11 +797,49 @@
display: flex;
justify-content: space-between;
flex-direction: column;
+
+ .sku_goods_tit {
+ font-size: 30rpx;
+ width: 60vw;
+ /* 容器的宽度 */
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
+ .sku_goods_price {
+ color: red;
+ font-size: 30rpx;
+ font-weight: bold;
+ }
}
// justify-content;
}
+ .sku_size {
+ margin: 40rpx 0;
+
+ .size_li {
+ display: inline-block;
+ // width: 100rpx;
+ padding: 5rpx 20rpx;
+ margin-right: 20rpx;
+ text-align: center;
+ color: black;
+ border: 1px solid #EBECEE;
+
+ // height: 2;
+ }
+
+ .act_size_li {
+ background-color: #FF5C2D;
+ color: white;
+ border: #FF5C2D 1px solid;
+
+ }
+ }
+
.sku_num {
display: flex;
justify-content: space-between;
@@ -765,12 +848,13 @@
.skuaddcart {
width: 50vw;
background-color: #FEAB00;
- margin: 0 auto;
+ margin: 20rpx auto;
height: 80rpx;
line-height: 80rpx;
text-align: center;
color: white;
border-radius: 80rpx;
+ // margin-top: 20rpx;
}
}
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index 3f13657..6a82f59 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -304,7 +304,7 @@
deleteAndroidHeight
这两个参数用于控制评论等的高度
-->
-
@@ -653,6 +653,15 @@
that.$util.Tips({
title: res.message
});
+ // setTimeout(function() {
+ // uni.redirectTo({
+ // url: '/pages/plantGrass/plant_user/index?id=' +
+ // item.uid
+ // })
+ // }, 1000);
+ uni.navigateBack({
+ delta: 1,
+ })
}
})
diff --git a/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue b/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue
index 8446699..b918f45 100644
--- a/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue
+++ b/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue
@@ -451,9 +451,10 @@
left: 0;
background: #ffffff;
display: flex;
- align-items: center;
+ // align-items: center;
justify-content: space-between;
- padding: 15rpx 30rpx;
+ padding: 30rpx 60rpx;
+ padding-bottom: 100rpx;
border-top: 1rpx solid #F5F5F5;
flex-direction: row;
width:750rpx;
@@ -466,7 +467,7 @@
width: 480rpx;
background: #F7F7F7;
border-radius: 31rpx;
- padding: 12rpx 30rpx;
+ padding: 15rpx 30rpx;
}
.send{
font-size: 26rpx;
diff --git a/store/modules/app.js b/store/modules/app.js
index 9d86afa..057eb0e 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -117,38 +117,52 @@ const actions = {
} else {
apptype = 1
}
-console.log(os)
Appversion({
version: os.appWgtVersion,
- type: apptype
+ type: apptype,
+ phone_brand: os.brand
+
}).then((res) => {
-
+
if (Object.keys(res.data.appInfo).length > 0) {
-
- // if(res.data.appInfo.version) uni.showLoading({
+ // if(res.data.appInfo.version) uni.showLoading({
// title: '检查更新中'
// })
- // 版本更新
- if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
- compareVersions(res.data.appInfo.version,
- wgt_v) == 1) {
- try {
- let info = res.data.appInfo || {};
- let version = {
- title: info.title || '发现新版本',
- content: info.content || '修复了部分BUG',
- versionName: info.version || '1.0.1',
- downUrl: info.dow_url || '',
- force: info.force == 1 ? true : false, // 是否强制更新
- quiet: info.quiet == 1 ? true : false // 是否静默更新
- }
- Updater.update(version);
- } catch (e) {
- console.log(e);
+ if (res.data.appInfo.phone_brand.length > 0) {
+ if (plus.os.name == "Android") {
+ // 跳转安卓应用市场
+ let appurl = res.data.appInfo.dow_url //这个是通用应用市场，如果想指定某个应用商店，需要单独查这个应用商店的包名或scheme及参数
+ plus.runtime.openURL(appurl)
+ } else {
+ // 跳转AppStore
+ plus.runtime.launchApplication({
+ action: res.data.appInfo.dow_url,
+ })
+ }
+ } else {
+
+ // 版本更新
+ if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
+ compareVersions(res.data.appInfo.version,
+ wgt_v) == 1) {
+ try {
+ let info = res.data.appInfo || {};
+ let version = {
+ title: info.title || '发现新版本',
+ content: info.content || '修复了部分BUG',
+ versionName: info.version || '1.0.1',
+ downUrl: info.dow_url || '',
+ force: info.force == 1 ? true : false, // 是否强制更新
+ quiet: info.quiet == 1 ? true : false // 是否静默更新
+ }
+ Updater.update(version);
+ } catch (e) {
+ console.log(e);
+ }
+ // uni.hideLoading();
}
- // uni.hideLoading();
}
}
From 768f94d2bb62914e6469d2790d79a6a40d77648c Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Thu, 14 Sep 2023 19:18:49 +0800
Subject: [PATCH 07/26] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=20=E4=BB=A5=E5=8F=8A?=
=?UTF-8?q?=E6=B3=A8=E9=94=80=E5=8A=9F=E8=83=BD=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/store/settled/index.vue | 69 ++++++++++++++++++++++++++-------
pages/users/user_info/index.vue | 4 +-
2 files changed, 57 insertions(+), 16 deletions(-)
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 4a62a93..7a183d9 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -106,15 +106,42 @@
- 社会信用代码
- 详细地址
+
-
+
+
+
+
+
+ 公司名称
+
+
+
+
+
+
+
+
+
+
+ 社会信用代码
+
+
+
+
+
+
+
当前版本
From 802356f1ae11a13a5e600de5f791b2fa69c790ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=97=9C=E8=A1=80=E9=BE=99=E5=B8=85?= <1493694146@qq.com>
Date: Thu, 14 Sep 2023 19:48:49 +0800
Subject: [PATCH 08/26] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/nongKe/supply_chain/supplier.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 1a8578b..279caa0 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -36,7 +36,7 @@
-
+
From 46e2771c8bfe8e8e90440ec976d1ad9b8f901741 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 18 Sep 2023 14:12:06 +0800
Subject: [PATCH 09/26] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/store/settled/index.vue | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 7a183d9..4372418 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -19,13 +19,7 @@
placeholder-class='placeholder' />
-
-
- 用户姓名
-
-
-
+
联系电话
@@ -128,6 +122,13 @@
+
+
+ 法人名称
+
+
+
From b7510c0c9cfe4db139fb26e5e0abf9f120bd77e3 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 18 Sep 2023 14:14:53 +0800
Subject: [PATCH 10/26] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/store/settled/index.vue | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 7a183d9..4372418 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -19,13 +19,7 @@
placeholder-class='placeholder' />
-
-
- 用户姓名
-
-
-
+
联系电话
@@ -128,6 +122,13 @@
+
+
+ 法人名称
+
+
+
From 31a5da396bff5982256d076248c88a66ea0bb292 Mon Sep 17 00:00:00 2001
From: THK3121
Date: Mon, 18 Sep 2023 19:06:36 +0800
Subject: [PATCH 11/26] =?UTF-8?q?=E4=BE=9B=E9=94=80=E7=BB=BC=E5=90=88?=
=?UTF-8?q?=E4=BA=91=E5=B8=82=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 4 +-
components/zbpSwiper.vue | 18 +-
config/app.js | 4 +-
pages.json | 41 +++--
pages/nongKe/cloud_entrepot/index.vue | 218 ++++++++++++++++++++++---
pages/nongKe/supply_chain/supplier.vue | 183 ++++++++++++++++++++-
pages/supply_chains/supply_chains.vue | 2 +-
static/images/GXSC/SL.png | Bin 0 -> 1306 bytes
static/images/GXSC/XL.png | Bin 0 -> 1329 bytes
9 files changed, 407 insertions(+), 63 deletions(-)
create mode 100644 static/images/GXSC/SL.png
create mode 100644 static/images/GXSC/XL.png
diff --git a/App.vue b/App.vue
index 951f3f5..ccf1435 100644
--- a/App.vue
+++ b/App.vue
@@ -215,7 +215,7 @@
},
onShow() {
-
+
let that = this
// 记录H5和公众号
if (this.$store.state.app.token) {
@@ -244,7 +244,7 @@
// #endif
},
mounted() {
-
+
},
methods: {
diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue
index a0a1e90..1197dc4 100644
--- a/components/zbpSwiper.vue
+++ b/components/zbpSwiper.vue
@@ -67,14 +67,14 @@
type: Boolean,
default: false
},
- location_Arr: {
- type: Object,
- default: () => ({})
- },
- town: {
- type: String,
- default: false
- },
+ // location_Arr: {
+ // type: Object,
+ // default: () => ({})
+ // },
+ // town: {
+ // type: String,
+ // default: false
+ // },
},
data() {
@@ -130,7 +130,7 @@
},
selectLocation() {
this.isSelectPlace ? this.showPicker = true : ''
-
+ console.log(this.columnData)
},
confirm(e) {
diff --git a/config/app.js b/config/app.js
index 8036f9b..adddc06 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,8 +9,8 @@ let httpApiThree
// 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' // 测试
if (process.env.NODE_ENV === "development") {
- // httpApi = 'https://shop.lihaink.cn' // 生产
-httpApi = "https://crmeb-test.shop.lihaink.cn"
+ // httpApi = 'https://shop.lihaink.cn' // 生产
+ httpApi = "https://crmeb-test.shop.lihaink.cn"
// httpApi = "http://192.168.0.222"
// httpApi = "http://192.168.0.108:8325"
// httpApi = 'http://192.168.0.108:8325'
diff --git a/pages.json b/pages.json
index de765b2..7575445 100644
--- a/pages.json
+++ b/pages.json
@@ -128,26 +128,25 @@
"enablePullDownRefresh": false
}
+ }, {
+ "path": "uni_modules/guyue-updater/pages/updater",
+ "style": {
+ "app-plus": {
+ "animationDuration": 200,
+ "animationType": "fade-in",
+ "background": "transparent",
+ "backgroundColorTop": "transparent",
+ "bounce": "none",
+ "popGesture": "none",
+ "scrollIndicator": false,
+ "titleNView": false
+ },
+ "backgroundColor": "transparent",
+ "disableScroll": true,
+ "navigationStyle": "custom"
+ }
}
- ,{
- "path": "uni_modules/guyue-updater/pages/updater",
- "style": {
- "app-plus": {
- "animationDuration": 200,
- "animationType": "fade-in",
- "background": "transparent",
- "backgroundColorTop": "transparent",
- "bounce": "none",
- "popGesture": "none",
- "scrollIndicator": false,
- "titleNView": false
- },
- "backgroundColor": "transparent",
- "disableScroll": true,
- "navigationStyle": "custom"
- }
-}
-],
+ ],
"subPackages": [{
"root": "pages/goods_cate",
"name": "goods_cate",
@@ -1625,7 +1624,7 @@
"iconPath": "static/tabbar_icon/c.png",
"selectedIconPath": "static/tabbar_icon/c-a.png",
"text": "发布"
-
+
},
{
"pagePath": "pages/supply_chains/supply_chains",
@@ -1641,7 +1640,7 @@
"text": "我的"
}
]
-
+
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 2b81a0b..1a4ab2a 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -19,23 +19,54 @@
-
-
-
-
-
-
- {{town}}里海云仓
+
+
+
+
+
+
+ {{town}}里海云仓
+
+
+
+
+
+
+
+ {{street}}
+
+
+
+ 全部
+
+
+
+
+
-
-
- 全部
+
+
+
+
+ 供销综合云市场
+
+
+ 供销综合云商品
+
+
+
+
+
+
+
@@ -175,7 +206,7 @@
-
+
暂无商品
@@ -251,7 +282,7 @@
-
+
当前区域暂无云仓
@@ -315,7 +346,8 @@
-
+
@@ -350,13 +382,27 @@
import {
goShopDetail
} from '@/libs/order.js'
+ // 7200 = 8 = 80000 8616
import {
postCartAdd,
} from '@/api/store.js';
import authorize from '@/components/Authorize';
+
+ import {
+ getArea,
+ getStreet
+ } from '@/api/article.js';
+ import {
+ getIndexData,
+ getDiy
+ } from '@/api/api.js'
+ import {
+ getGeocoder
+ } from '@/api/store.js';
import {
mapGetters
- } from "vuex";
+ } from 'vuex'
+ import Cache from '@/utils/cache';
export default {
components: {
authorize,
@@ -368,6 +414,8 @@
},
+ showPicker: false,
+ columnData: [],
skusize: 0,
skuNumber: 1,
showcartpop: false,
@@ -383,10 +431,12 @@
isEmpty: false,
winHeight: 0,
cloudList: [],
+ street: '',
street_code: '',
totalMoney: 0,
town: '',
list: [1, 1, 1, 1, 1],
+ showSelect: false,
showPop: false,
keyword: "",
showLoading: false,
@@ -430,6 +480,8 @@
this.street_code = e.street
this.town = e.town
this.getCloundShop()
+ this.street = e.town
+ this.Area()
// console.log(this.appInfo, "手机信息")
},
onShow() {
@@ -522,6 +574,102 @@
// },
methods: {
+ swiperClick(item) {
+ const url = item.info[1].value
+ uni.navigateTo({
+ url: url
+ })
+ },
+ selectLocation() {
+ this.isSelectPlace ? this.showPicker = true : ''
+ console.log(this.columnData)
+ },
+
+ confirm(e) {
+
+ this.showPicker = false
+ this.$emit('selectPlce', e)
+ this.$emit('change', e)
+ this.street = e.value[1].name
+ this.$nextTick(() => {
+ this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
+ })
+ this.street_code = e.value[1].code
+
+ this.getCloundShop()
+
+
+
+ },
+ changeHandler(e) {
+ const {
+ columnIndex,
+ value,
+ values,
+ index,
+ picker = this.$refs.uPicker
+ } = e;
+ if (columnIndex === 0) {
+ getStreet({
+ area_code: value[0]['code']
+ }).then(res => {
+ picker.setColumnValues(1, res.data);
+ });
+ }
+ },
+ Area() {
+ getArea({
+ city_code: 510500
+ }).then(res => {
+ this.$refs.uPicker.setColumnValues(0, res.data);
+ this.Street(res.data[0]['code']);
+ });
+ },
+ Street(code) {
+ getStreet({
+ area_code: code
+ }).then(res => {
+ this.$refs.uPicker.setColumnValues(1, res.data);
+ });
+ },
+
+ swiperChange(e) {
+ let {
+ current,
+ source
+ } = e.detail;
+ if (source === 'autoplay' || source === 'touch') {
+ this.bgColor = this.swiper.url[e.detail.current]['img']
+ this.$emit('kkchange', this.bgColor)
+ }
+ },
+
+
+ // 对象转数组
+ objToArr(data) {
+ let obj = Object.keys(data).sort();
+ let m = obj.map(key => data[key]);
+ return m;
+ },
+ async getBanner(id) {
+ let that = this;
+ const {
+ data
+ } = await getDiy({
+ id: 0
+ })
+ that.styleConfig = that.objToArr(data.value);
+ /* 循环数组得到数据*/
+ that.styleConfig.forEach((item, index, arr) => {
+ if (item.name == 'headerSerch' || item.name == 'homeComb') {
+ if (item.name == 'homeComb') {
+ that.swiper.url = item.swiperConfig.list
+ }
+ }
+ })
+ this.bgColor = this.swiper.url[0].img
+ },
skusizechange(i) {
this.skusize = i
@@ -786,6 +934,34 @@
}
}
+ .selected-list {
+ padding: 24rpx 14rpx;
+ border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+ background-color: #fff;
+ position: absolute;
+ left: 100rpx;
+ font-size: 29.79rpx;
+ z-index: 9999;
+ top: 100rpx;
+
+
+
+ .triangle-up {
+ width: 0;
+ height: 0;
+ border-left: 10rpx solid transparent;
+ border-right: 10rpx solid transparent;
+ border-bottom: 10rpx solid white;
+ position: absolute;
+ top: -10rpx;
+ }
+
+ .selected-li {
+ margin-bottom: 35rpx;
+ }
+ }
+
+
.sku {
padding: 20rpx;
@@ -1019,7 +1195,7 @@
margin-left: 20rpx;
font-size: 40rpx;
// font-weight: 700;
- transform: skewX(-10deg);
+ // transform: skewX(-10deg);
}
@@ -1029,7 +1205,7 @@
.head {
position: fixed;
- z-index: 100;
+ z-index: 999;
color: white;
display: flex;
justify-content: space-between;
@@ -1068,6 +1244,10 @@
}
+ .town_name {
+ margin-right: 20rpx;
+ }
+
.goods_list {
min-height: 95vh;
padding: 0 10rpx;
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 1a8578b..8e9ccef 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -14,29 +14,51 @@
-
+
供销综合云市场
+
+
+
+
-
+
+
+
+ {{street}}
+
+
+
+ 供销综合云市场
+
+
+ 供销综合云商品
+
+
+
+
-
+
@@ -274,6 +296,11 @@
+
+
+
+
@@ -303,6 +330,18 @@
configMap
} from '@/utils';
import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+ import {
+ getArea,
+ getStreet
+ } from '@/api/article.js';
+ import {
+ getIndexData,
+ getDiy
+ } from '@/api/api.js'
+
+
+
+ import Cache from '@/utils/cache';
const app = getApp();
export default {
components: {
@@ -312,6 +351,8 @@
},
data() {
return {
+ defaInd: [0, 0],
+ columnData: [],
imgList: [
"/static/images/GXSC/BBY.png",
"/static/images/GXSC/NYSC.png",
@@ -331,6 +372,7 @@
"/static/images/GXSC/JDMS.png",
],
street_id: "",
+ showSelect: false,
price: 0,
stock: 0,
nows: false,
@@ -348,6 +390,8 @@
downKey: 0,
downStatus: false,
menuList: [],
+ street: "",
+ showPicker: false,
// 下拉菜单
downMenu: [{
title: '默认',
@@ -406,6 +450,7 @@
onLoad(options) {
// console.log(options);
this.street_id = options.street_id
+ this.street = options.townName
this.product_type = options.product_type ?? 0
if (options.street_id != undefined) {
this.sotreParam.street_id = options.street_id
@@ -424,7 +469,7 @@
supMenuApi().then(res => {
this.menuList = res.data
})
-
+ this.Area()
},
computed: {
downMenus: function() {
@@ -445,6 +490,96 @@
}, mapGetters(['viewColor'])),
},
methods: {
+ selectLocation() {
+ this.isSelectPlace ? this.showPicker = true : ''
+
+ },
+
+ confirm(e) {
+ this.showPicker = false
+ this.$emit('selectPlce', e)
+ this.$emit('change', e)
+ console.log(e)
+ this.street = e.value[1].name
+ this.$nextTick(() => {
+ this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
+ })
+
+ this.sotreParam.street_id = e.value[1].code
+ this.street_id = e.value[1].code
+ this.storeMerchantList()
+
+ },
+ changeHandler(e) {
+ const {
+ columnIndex,
+ value,
+ values,
+ index,
+ picker = this.$refs.uPicker
+ } = e;
+ if (columnIndex === 0) {
+ getStreet({
+ area_code: value[0]['code']
+ }).then(res => {
+ picker.setColumnValues(1, res.data);
+ });
+ }
+ },
+ Area() {
+ getArea({
+ city_code: 510500
+ }).then(res => {
+ this.$refs.uPicker.setColumnValues(0, res.data);
+ this.Street(res.data[0]['code']);
+ });
+ },
+ Street(code) {
+ getStreet({
+ area_code: code
+ }).then(res => {
+ this.$refs.uPicker.setColumnValues(1, res.data);
+ });
+ },
+
+ swiperChange(e) {
+ let {
+ current,
+ source
+ } = e.detail;
+ if (source === 'autoplay' || source === 'touch') {
+ this.bgColor = this.swiper.url[e.detail.current]['img']
+ this.$emit('kkchange', this.bgColor)
+ }
+ },
+
+
+ // 对象转数组
+ objToArr(data) {
+ let obj = Object.keys(data).sort();
+ let m = obj.map(key => data[key]);
+ return m;
+ },
+ async getBanner(id) {
+ let that = this;
+ const {
+ data
+ } = await getDiy({
+ id: 0
+ })
+ that.styleConfig = that.objToArr(data.value);
+ /* 循环数组得到数据*/
+ that.styleConfig.forEach((item, index, arr) => {
+ if (item.name == 'headerSerch' || item.name == 'homeComb') {
+ if (item.name == 'homeComb') {
+ that.swiper.url = item.swiperConfig.list
+ }
+ }
+ })
+ this.bgColor = this.swiper.url[0].img
+ },
+
test() {
if (this.sotreParam.keyword.length > 3) {
this.sotreParam.keyword.slice(0, 3)
@@ -462,6 +597,11 @@
url
})
},
+ navGoto(url) {
+ uni.redirectTo({
+ url
+ })
+ },
navGo(id) {
uni.navigateTo({
url: `/pages/nongKe/supply_chain/supplierA?type_id=10&merchant_category_id=${id}&street_id=${this.street_id}`
@@ -644,7 +784,7 @@
// console.log(rqData)
storeMerchantList(rqData).then(res => {
this.count = res.data.count
- this.storeList = this.storeList.concat(res.data.list)
+ this.storeList = (res.data.list)
this.loading = false
this.loadingIcon = false
})
@@ -674,7 +814,7 @@
this.rightBox = true
},
// 组件确定
- confirm(data) {
+ confirm1(data) {
let arr1 = [],
arr2 = []
if (data.storeTypeArr.length == 0) {
@@ -1086,6 +1226,31 @@
margin-left: 10rpx;
}
+ .selected-list {
+ padding: 24rpx 14rpx;
+ border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+ background-color: #fff;
+ position: absolute;
+ left: 100rpx;
+ font-size: 29.79rpx;
+
+
+
+ .triangle-up {
+ width: 0;
+ height: 0;
+ border-left: 10rpx solid transparent;
+ border-right: 10rpx solid transparent;
+ border-bottom: 10rpx solid white;
+ position: absolute;
+ top: -10rpx;
+ }
+
+ .selected-li {
+ margin-bottom: 35rpx;
+ }
+ }
+
.store-wrapper {
margin-top: 235rpx;
border-top: 1px solid #F6F6F6;
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 9f4d616..d2f1f08 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -24,7 +24,7 @@
+ :url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}&townName=${town}`">
diff --git a/static/images/GXSC/SL.png b/static/images/GXSC/SL.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b1663cd84f6577f43c90ee7c872a5747b85d896
GIT binary patch
literal 1306
zcmeAS@N?(olHy`uVBq!ia0vp^J|N7&1|*M957Y)yjKx9jP7LeL$-HD>V7cPy;uum9
z_x5INwoIxB`-kFrH;=Z7i^b3dXk@G*{I2RFlnjylyv^BEE}
zIhu^m6ia*5EJ>L6{I0vpdZq*29TssVZ7x?_j%;UqV48fUpZVg386_z|`MsJMWtPP-^}SaWYO2(l31~GdgYGfcCKYx%ccgs+?>(0
z`=Z&;`wR&OB_4mz+}C%Rhj&fX+OVlX>4Js%2iNUWSajK?WMW5@*GhN6j|L1jkp|DK
z1ke87mv1#MSDwk4u{bu|x^HsQ+mpAA1^0G#td~x%JNbL}^U8AO1KOz$r1=YQ|3KlRLI>oxbOLGKw3tXo^D^sBprkJYi@VA{Go
zV`kRNQTEepH-FlYr{ej^M}Q^1$ZY*qyM~VWN{`+JF5u#hF%rVXVrU4FGbt#R;ZL$%B;R@x@(t$Yep@*_r^`P3v`}O
z`)ON!u4V4JC1>w%y>_`{$DL=B%M~(eS+x%_HDr5EI>YMtVJ&Z4u9|DG*V6L`Zx+qIq#a=7>855#6Gd%DTaowCK5x1rF!IPNlwJSojmd-y?{%p%Hd8MkZ-w!Y4
z{oQ8*a;Cq)$7yp~*KLVf%iQbsxSEg2JbGn_oW@kI=K_WI6)sk>U5=7>J2JU4!llHr
zYf*Fav0E&s?$ynaSBdgZ(3}?ZN|{09dCXOLfx@yI>ywPOsJiUg?|XS3Z_@+gyk_&y
zvCX21j0eg+C&}m*|Cu>hVCHu6<@~=Y0j`;ZW5}Ah?^Hocwb4_T$_6jE+S_Mzmf!X?xz9
zlfm6gTxpSUN5vJ1&)dKDl{;(*TG=z*Yv~vF89V>aIbFT){r-f_w%Hrjq#p0guveOA
zdTdYP<^z6buVig~d^4Z*^y}BJ)vsNFVdQ&MBb@0LzzDfdBvi
literal 0
HcmV?d00001
diff --git a/static/images/GXSC/XL.png b/static/images/GXSC/XL.png
new file mode 100644
index 0000000000000000000000000000000000000000..c32307572d037e763df385bc5c91593c99531efc
GIT binary patch
literal 1329
zcmb7E{a2C)7=1BHWz#e)5#dyZm}#kpB9|XaeAQIMLKn_2sJ7II9FiTi6ht$Oq?S>B
zkHn8-31LQq%%n6)Ct4b`FsI3MW|`Yb=LeEwe?reW&%Ni|`@=oY{oyG-ND8xoAz=Uj
z*n}Sd$z~@0zgFwasJ?N?!%PqsIg9{E`%&)z0Qx>042sQ4o+*!{W4?1x4=A-IVzjes
z?YIc;S~e!WecMA+fZdAS0k1XmmuwEQA5q#ba77;9auOcDT12`Plyj_NGTWT77^H)%
z?eTLP;00$g(aJ%an=#do8kdDnn;5IJ*()DcUmEb-L{E!nWIh6l7=l_5IX>3j6XV{H
zZj9<0zY~fm1!8vD!f8YcqSE(^%~Lb7mX;Q{SSWPprDT{`x4a=AB~^+;2Z*I
zE;_RKfWg$MBI*Y(@Dwk|v~*?Y_~4^erw!{QUXV5O8zhkt|(9Af5JT
zHin?mnoK4folbAV_Y_Io9bn3nc%wVuuaA$kgC6#52C<4+V+WwxX&uFGZ)-Cyc6WDE
zJJ)5zel9L9b`A>-?O&q`mh5wRfGm0&Ub!sE&#qaxN1is-iNMp@DJdy=EEY?ReJ9#u
zFc_B31+pRbjru>6VcfB*s3e_=C_CDsnDQ0mUk|rRmcDw=n#fp+uIwrpbl^X&M5&dj
zz0uE{wD0Fz&HAz7oH&)IDCza^aAgvex~jR)$(zQyxrMQmZ*BlTvAt;Jh?6u+QM)DZ
zx{!cBA=eY-@$I^3MDzeNXV>OsKCd%uCq~k!T-yRw1Id94mtg_~gsdt~RPcmfxfsSa3G;xGE
znDzK$RYknbTgNjcQ5#-FA99GI+}6$xS&TJ*%3a;%5+BqRV=Z3^1|!p|wett=@2?E$
z8n`NgsLnWq;Diwq&ZJL?jGG4)ex*H$gs$M(81M&LK$9H5o+Fh?L+@^^AWy>qMc~a^
zs(5=&9rbzQtMFql0re8h(^`8x_zs4jD
zQl90Z)G0Y{n`;DhJ9oP*7w{(U>4eGqaWXsRM*DOUFNLO|OEg1wQz!%GFr-VKfVa(B
z_;EK<`6kM-<}W2Li+M$s6L@v!^9H01ni~qXfpegKWWhiEme2B1;n~BK7C**ODoRH@
zfuvj70OS#>|A5~}e|t%Z_qI{t*~?rVg@$EX?p=ul@1#mbr|z{*E|8n%{9P)BUck*K
zP~vjYJ=gy^EhJC2uu}^!33z?RA=b}zahn2b$ZLv6bTv?r<{;G%C-Zp4?o1!znfUt
zesR+d;YCubucjj30=M>o^z0zBip861a9>nacmOirsmsRvHFW$3fu&PwoPcMe`>YD+L`3C~wAtX>rpmF~LDMx2a
literal 0
HcmV?d00001
From e70850d2fa3a320318a81f75d7a52c3efa9f422b Mon Sep 17 00:00:00 2001
From: THK3121
Date: Tue, 19 Sep 2023 15:20:05 +0800
Subject: [PATCH 12/26] =?UTF-8?q?=E4=BA=91=E4=BB=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/nongKe/cloud_entrepot/index.vue | 482 ++++++++++++-------------
pages/nongKe/supply_chain/supplier.vue | 89 +++--
static/images/GXSC/BSL.png | Bin 0 -> 1109 bytes
static/images/GXSC/SS.png | Bin 5886 -> 2792 bytes
static/images/GXSC/SSBT.png | Bin 0 -> 5886 bytes
static/images/GXSC/XZ.png | Bin 0 -> 942 bytes
6 files changed, 298 insertions(+), 273 deletions(-)
create mode 100644 static/images/GXSC/BSL.png
create mode 100644 static/images/GXSC/SSBT.png
create mode 100644 static/images/GXSC/XZ.png
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 760c1ff..644c650 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -16,33 +16,34 @@
-->
-
-
+
-
-
+
+
-
+
-
-
+
{{town}}里海云仓
-
-
+
-
+
- {{street}}
+ {{street}}
- 全部
+ 全部
@@ -50,16 +51,17 @@
-
+
-
供销综合云市场
-
- 供销综合云商品
+
+ 供销综合云商品
+
-
@@ -67,8 +69,6 @@
-
-
@@ -98,8 +98,8 @@
-
-
+
+
-
+
-
-
-
-
- {{item.tit}}
-
-
-
-
+
+
+
+ {{item.tit}}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- {{item.store_info}}
-
-
-
- {{item.rate}}
- {{item.reply_count}}评论
-
-
-
-
- ￥{{item.price}}
-
-
- ￥30.00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
- 暂无商品
-
-
-
-
-
-
+
-
-
-
-
- {{goodsNum}}
-
-
-
-
- ￥{{totalMoney}}
-
-
- 支持配送 售后无忧
-
-
+
- 去结算
+
+
+ {{item.store_info}}
+
+
+
+ {{item.rate}}
+ {{item.reply_count}}评论
+
+
+
+
+ ￥{{item.price}}
+
+
+ ￥30.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无商品
+
-
+
+
+
+
+
+
+
+ {{goodsNum}}
+
+
+
+
+ ￥{{totalMoney}}
+
+
+ 支持配送 售后无忧
+
+
+
+
+ 去结算
+
+
+
+
-
-
-
-
-
-
-
- 里海云仓
+
+
+
+
+
+
+
+ 里海云仓
+
-
-
-
-
-
-
- {{item.category_name}}云仓服务
-
-
- {{item.description}}
+
+
+
+
+
+ {{item.category_name}}云仓服务
+
+
+ {{item.description}}
+
-
+
+
+
-
+
-
-
-
+ -->
+
-
-
- 当前区域暂无云仓
+
+
+ 当前区域暂无云仓
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
@@ -313,8 +318,6 @@
-
-
尺码
@@ -323,7 +326,6 @@
{{item.sku}}
-
@@ -335,9 +337,7 @@
-
确定
-
@@ -345,20 +345,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -410,10 +396,8 @@
data() {
let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
return {
- skuform: {
-
-
- },
+ skuform: {},
+ defaInd: [0, 0],
showPicker: false,
columnData: [],
skusize: 0,
@@ -482,10 +466,38 @@
this.getCloundShop()
this.street = e.town
this.Area()
+ let that = this
+ setTimeout(() => {
+ uni.createSelectorQuery()
+ .in(this)
+ .select('.flags')
+ .boundingClientRect(rect => {
+ that.headtop = rect.top
+ })
+ .exec();
+ uni.createSelectorQuery()
+ .in(this)
+ .select('.flags')
+ .boundingClientRect(rect => {
+ this.headtop = rect.top
+ })
+ .exec();
+ uni.createSelectorQuery()
+ .in(this)
+ .select('.cart')
+ .boundingClientRect(rect => {
+ // console.log(this.cartTagInfo, 6666)
+ this.cartTagInfo = rect
+ })
+ .exec();
+ // console.log(that.headtop)
+ }, 500)
+
// console.log(this.appInfo, "手机信息")
},
onShow() {
this.cartFn()
+ this.showSelect = false
},
// 分页
onReachBottom() {
@@ -524,8 +536,6 @@
// }
// })
},
-
-
onPageScroll(e) {
let that = this
this.showtit = !Boolean(e.scrollTop)
@@ -546,22 +556,6 @@
}
})
.exec();
- if (this.headtop) return
- uni.createSelectorQuery()
- .in(this)
- .select('.flags')
- .boundingClientRect(rect => {
- this.headtop = rect.top
- })
- .exec();
- uni.createSelectorQuery()
- .in(this)
- .select('.cart')
- .boundingClientRect(rect => {
- this.cartTagInfo = rect
- })
- .exec();
-
},
onPullDownRefresh() {
this.getCloundShop()
@@ -569,11 +563,12 @@
this.cartFn()
uni.stopPullDownRefresh()
},
- // onReachBottom() {
- // console.log("daidi")
-
- // },
methods: {
+ showpick() {
+ this.showPicker = !this.showPicker
+
+
+ },
swiperClick(item) {
const url = item.info[1].value
uni.navigateTo({
@@ -582,11 +577,10 @@
},
selectLocation() {
this.isSelectPlace ? this.showPicker = true : ''
- console.log(this.columnData)
+
},
confirm(e) {
-
this.showPicker = false
this.$emit('selectPlce', e)
this.$emit('change', e)
@@ -595,11 +589,12 @@
this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
})
+
+ // this.sotreParam.street_id = e.value[1].code
this.street_code = e.value[1].code
-
this.getCloundShop()
-
-
+ this.town = e.value[1].name
+ // this.storeMerchantList()
},
changeHandler(e) {
@@ -619,11 +614,14 @@
}
},
Area() {
+ let that = this
getArea({
city_code: 510500
}).then(res => {
+
this.$refs.uPicker.setColumnValues(0, res.data);
this.Street(res.data[0]['code']);
+ // console.log(res.data, 66666)
});
},
Street(code) {
@@ -631,6 +629,7 @@
area_code: code
}).then(res => {
this.$refs.uPicker.setColumnValues(1, res.data);
+
});
},
@@ -652,24 +651,6 @@
let m = obj.map(key => data[key]);
return m;
},
- async getBanner(id) {
- let that = this;
- const {
- data
- } = await getDiy({
- id: 0
- })
- that.styleConfig = that.objToArr(data.value);
- /* 循环数组得到数据*/
- that.styleConfig.forEach((item, index, arr) => {
- if (item.name == 'headerSerch' || item.name == 'homeComb') {
- if (item.name == 'homeComb') {
- that.swiper.url = item.swiperConfig.list
- }
- }
- })
- this.bgColor = this.swiper.url[0].img
- },
skusizechange(i) {
this.skusize = i
@@ -702,9 +683,8 @@
},
valChange(e) {
- console.log(e.value)
this.skuNumber = e.value
- // this.valChange = e.value
+
},
closecartpop() {
this.showcartpop = false
@@ -726,7 +706,7 @@
},
cartFn() {
getCartList().then(res => {
- console.log(res)
+ // console.log(res)
this.totalMoney = 0
this.cartList = res.data.list
this.cartList.forEach(e => {
@@ -765,7 +745,6 @@
})
},
serch() {
- // console.log(this.keyword)
this.getList()
},
goBack() {
@@ -814,14 +793,12 @@
},
addcart(item, i) {
-
- // console.log(this.isLogin)
if (!this.isLogin) {
this.isAuto = true;
this.isShowAuth = true
return
}
- // console.log(item.sku[''] ? "1" : "2")
+
if (item.sku['']) {
let data = {
cart_num: 1,
@@ -831,14 +808,11 @@
product_type: item.product_type,
spread_id: "",
}
-
let that = this
- // return
-
uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
that.trnList[i].left = this.cartTagInfo.left - data1.left;
that.trnList[i].bottom = this.cartTagInfo.top - data1.top;
- console.log(that.trnList[i])
+
let timer = setTimeout(() => {
that.trnList[i].left = 0
that.trnList[i].bottom = 0
@@ -858,7 +832,6 @@
})
}).catch(err => {
- // this.act_cart = false
uni.showToast({
title: err,
icon: "none",
@@ -873,11 +846,8 @@
this.showcartpop = true
const keys = Object.keys(item.sku);
const firstKey = keys[0];
-
-
- // console.log(keys[0])
this.skusize = keys[0]
- // console.log(this.skuform)
+
}
return
@@ -906,6 +876,7 @@
street_code: this.street_code,
category_id: this.cloudList[this.current].category_id
}).then(res => {
+ this.trnList = []
this.goodsList = res.data.list
this.goodsList.forEach(item => {
this.trnList.push({
@@ -914,8 +885,6 @@
})
})
})
- // console.log(this.cloudList)
- data.length < 1 ? Toast("暂无云仓") : '';
}
}
}
@@ -942,7 +911,9 @@
left: 100rpx;
font-size: 29.79rpx;
z-index: 9999;
- top: 100rpx;
+ // top: 100rpx;
+ opacity: 0;
+ transition: 0.5s;
@@ -957,7 +928,10 @@
}
.selected-li {
- margin-bottom: 35rpx;
+ margin-top: 35rpx;
+ color: #F84221;
+ display: flex;
+ align-items: center;
}
}
@@ -1543,4 +1517,20 @@
display: flex;
align-items: center;
}
+
+ .sl {
+ margin-left: 20rpx;
+ transform: rotate(180deg);
+ transition: 0.5s;
+ }
+
+ .actsl {
+ transform: rotate(0deg);
+ }
+
+ .actSel {
+ opacity: 1;
+ // transform: translateX(100rpx);
+
+ }
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 8e9ccef..2d73a0b 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -17,41 +17,42 @@
供销综合云市场
-
+
-
+
-
-
+
+ placeholder="请输入..." v-model="sotreParam.keyword" @search="onInputConfirm"
+ class="serch_cls">
- -->
-
+ src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx">
+
+
+
+
{{street}}
-
-
+
- 供销综合云市场
+ 供销综合云市场
供销综合云商品
-
@@ -62,8 +63,9 @@
- 热搜: 小张副食 正新酒店
+ 热搜:
+ 小张副食
+ 正新酒店
麻辣鸡
手撕椒麻鸡
@@ -297,7 +299,7 @@
-
@@ -353,6 +355,7 @@
return {
defaInd: [0, 0],
columnData: [],
+ showSerch: false,
imgList: [
"/static/images/GXSC/BBY.png",
"/static/images/GXSC/NYSC.png",
@@ -494,22 +497,18 @@
this.isSelectPlace ? this.showPicker = true : ''
},
-
confirm(e) {
this.showPicker = false
this.$emit('selectPlce', e)
this.$emit('change', e)
- console.log(e)
this.street = e.value[1].name
this.$nextTick(() => {
this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
})
-
this.sotreParam.street_id = e.value[1].code
this.street_id = e.value[1].code
this.storeMerchantList()
-
},
changeHandler(e) {
const {
@@ -532,7 +531,8 @@
city_code: 510500
}).then(res => {
this.$refs.uPicker.setColumnValues(0, res.data);
- this.Street(res.data[0]['code']);
+ // this.Street(res.data[0]['code']);
+ // console.log(res.data, 66666)
});
},
Street(code) {
@@ -540,6 +540,7 @@
area_code: code
}).then(res => {
this.$refs.uPicker.setColumnValues(1, res.data);
+ console.log(res.data, 9999)
});
},
@@ -554,7 +555,12 @@
}
},
+ onInputConfirm() {
+ this.showSerch = false
+ this.searchSubmit()
+
+ },
// 对象转数组
objToArr(data) {
let obj = Object.keys(data).sort();
@@ -584,7 +590,6 @@
if (this.sotreParam.keyword.length > 3) {
this.sotreParam.keyword.slice(0, 3)
this.sotreParam.keyword = this.sotreParam.keyword.slice(0, 3) + "..."
- console.log(this.sotreParam.keyword)
}
// console.log(this.sotreParam.keyword.length)
},
@@ -807,6 +812,7 @@
let that = this;
that.$set(that.sotreParam, 'keyword', this.sotreParam.keyword);
this.set_where(this.firstKey)
+ this.showSerch = false
},
// 右侧切换
bindRight() {
@@ -877,6 +883,9 @@
onPullDownRefresh() {
uni.stopPullDownRefresh()
},
+ onShow() {
+ this.showSelect = false
+ },
//上划加载更多
onReachBottom() {
if (this.count === this.storeList.length) {
@@ -972,7 +981,7 @@
height: auto;
background-color: white;
padding: 20rpx;
- border-radius: 20rpx;
+ // border-radius: 20rpx;
display: flex;
// align-items: center;
@@ -1013,6 +1022,11 @@
}
}
+ .selects {
+ transform: rotate(180deg);
+ }
+
+
.search-right.styleType2 .right-text,
.search-right.styleType3 .right-text {
@@ -1041,6 +1055,15 @@
}
}
+ .town_name {
+ // overflow: hidden;
+ // white-space: nowrap;
+ /* 设置文本不换行 */
+ // text-overflow: ellipsis;
+ font-size: 14px;
+ /* 设置溢出文本为省略号 */
+ }
+
.hot_serch {
color: #B3B3B3;
display: flex;
@@ -1233,7 +1256,9 @@
position: absolute;
left: 100rpx;
font-size: 29.79rpx;
-
+ opacity: 0;
+ transition: 0.5s;
+ height: 0;
.triangle-up {
@@ -1248,9 +1273,19 @@
.selected-li {
margin-bottom: 35rpx;
+ color: #F84221;
+ display: flex;
+ align-items: center;
}
}
+ .actSel {
+ opacity: 1;
+ height: auto;
+ // transform: translateX(100rpx);
+
+ }
+
.store-wrapper {
margin-top: 235rpx;
border-top: 1px solid #F6F6F6;
diff --git a/static/images/GXSC/BSL.png b/static/images/GXSC/BSL.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec02426598ced9879f4046c00d6021c05a6570a7
GIT binary patch
literal 1109
zcmeAS@N?(olHy`uVBq!ia0vp^J|N7&1|*M957Y)yjKx9jP7LeL$-HD>VBz<4aSW-5
zdpk4wv{^l)`_kc#d@tYRvcKwH_1zQac`Tn)eHR+kuU5bHZN?1{&2equr8gN
z`c9*x%Sz)yvy!3q#=rBLtix;$UB7Pp{>-eI<;-hKt-h~`Ja77av$>HIi_Q{1Lr$HH
zCYEUjnpm1Xl|(Rc3vryfoXDx;p`hX4uDU^?ae<92$&&FB?Vh(d?r^VRTGv*;j$uEO
zAEW!3H)j)WFH@SYZQ!}OaqfY~2fC(-{bPE=S~m0M$(0vgOeo1apz@Y+-iv@_-%o31
z+TQ$p*Kz$>nHfu7H-tBsHfy!_H=IrTcJzSF!t3c=K9ih3ZG7=5VCvaN`3>x6-!xDB
zv~}4`NdwRA%Ze@d+Gm>5%@G`eyiV0fzqw%)PgkE}XQD;XI>w
z*cW?d=`(Nk>h1iMwT#Q>Qf%s(RR@3ZRvbCQ=iW7ai&%y1jtaR8%h=W&sLFOayoYgGWQm5ziKR+psV*|BhRJgU4AcL{d3Nm+_C$*dQ+TziqMvejiM3zN_MRH
z^zi*Di^th34l2GBdvHT%VK3Jj)@zXoduP@f&A2j&g>_bcb9l(7Z&K>%j|@CtH~!^4
z_e&}wJ#F7UDO;7hPozs8tn&I~-_X8jvUl*r#TGz!@a|afNwIzFwKI0obFb{5TgF@<
z@?q`uPZGSh5)vlWsQxQr*17-uu6b^RcbdQb--_y47uXoJH+*A!9{%su^QF?~zGy6y
zk*xf_XWzlh{#iGrYwzBZj^JM7-@V!IyKc^j>PhQ#?|we!C3k;u-Yf34;s&0x8^opO
zl`L$P)Px(uRN!+3k)P~%hSncj$8sG@BXMXuqcXsDdl6O
zQ~?0^?}N4c0icjl?r-o|Z2YYeLfitt0s!7OO|u+1w=dn#8Xy7_LOfMU9avZehu{GK
z0WPGJi?(gwju~i{0IRC{NeJ=W{>Q=0)dp(oW!tvbP1D@EF3#!i*#InxVy=|>8KK>o
z3X{qU04|L&XJgUI!2zzpNhyz#l5#%`r&k2|#g@8nNq@y)0MWiFrCw(U?k)ucd7P_8
z4gwHu8~~gTIaT`T3IL#8Jl9&E`P`S{+N1z+x}42szX&0|xc@0$lIt1hy&7X)G);qH
zNfy6k0IRBc4gkOO)jEvhq?8Q+pb$}@>zEGZ`o)7RiefcLX0zG8jS(?+#8~kM2Fah)
zb$!9mPVXj?04&QAZQV(a-d4egFG
z<}y}nX8VWn=8=^0X#mNlZQH|G{iF0J8bB1zY&Lr%gz(Cq0Ki)esfFba#ZA05~#RVm#9SagYo)0l{DNwA#bLF9p$!#Jlz_Khc
zOrWO3uG_XfN|l
zegJTxweAx(k>7^}U{Mr>QtAyQNC$x9)E*{T8jcHnAPON~q;SZ31N3oPhJptN^Zn0C
zyaW(OLdv-SXcUO^?}WIPi=|f}ju|B(1lsw|pY=@9sfik1^afa#CB{y;j^}!zWYfys
zj(j?tH)2~@0B|d%IKOAag%3y%O}wh>`h`n2eg57HpiNG{BXnReoA>eA{74FiZMGoq
z-z>?i4K~bp?Rs~csfo6x*b87)RhVh%Tv-5sKa4R4LwTE@p3TpNAbODhOs&WF7E4k<
zUR4z)9e(VBi1DG;`jHEC=--0@V#dOz%DSHYp>11)M-oWrOLX1$@o;`ArSwW#gMj0`
zo24_AXLG5IYlQ;<&a~E;6kz`a10-tSE3Nf8d#^njBu$}P+LHoKDN`zCAX|s#QH)tA
z2q3Z3Z?)E0EZlxPoZ}Wk@6`q=;PU>>^4K+As;WY5?bPyE9(WKyiuSc_i!StFQ|Dcw
ze|$DSm14CfNy=^hdp}$}xLI}v_F~FMyOZQtZH$
zZRpyDFwOQ!3S2TGI63g@!Oe1~S8cWMPe)wH>X~~1bWNYQzNfYB(oSyqv$Tg0|B_;{
zHQl!P1c2N7ARcw4-CV&vZW-b9&bSf`GHVo8``+oRTN4
z>)K21UGGkAh%!Co7CQJsN1JGr?Dnt$ZXdi^KJ03{sw(LEJExf;10>kL4|QE{eqiY<
zzbvk&u1`m&DIzZgm}Mq^RClTBcvMH_RaVJ>~vr_=k+1st)IPX5f}^{?k$#`>w6S`
zfyzko=h|99
z@Q-yrxz&J6K)JU=*gM3wc1i|F@kF^?l>Y6^e2e}tO*Set9nk1()%J_KtZv7_Id
z780~iaC)D?0Btzo{G^zBu8%$a^=Y5t8*pY{Hv8&r1My~x77lg%VjmEp_fkGNkMVUb
z_BRNi)k4Y{DbbGC2o*N>eT2AA#Qf|o7$9N$_)1n^vqM8YH?6H@{JmN{Q-UzbuI0KmKtuno`oe-+oPCgbV&)S82Ax#460*8(7HJC8A2
zvb2dst&B0J+ng+GM{$-&3NblAtBqJJ3y*Fl9J0zH`(BOMI)_*)&v`cGL~k`0kO&S#nc%Xp
zlwE3@87X57=7zm%EM)=k4#?1w;K6FP>7d|1;!5rL+WU~KO;!Ncg0!`3Q7aKaT3QdiKORb^UN-5P22I%o5HE(6OO@EIUeoy^Y;K4ftejsN3)-
zfQeyJAx;1jgYkKswd*_6iatBJCk^zGJma;F)EoID*$E&cl#r(I_!he|^4QiJKJf|Y
zCx9VR&*+{BU`8-Px-tO_ky=LgOaL>25z>_jV2IQ*x@Q8I5sZ+oOaMcqmeD;Ez>Hvo
ubY%hPy0xJg7oRCr$Poe7Xt<(0?(hi(B8gA3R_1o~anxRyr61*1_AGQkWw$tY?jPF$)q
z3f+jAnn=c(*p^F7QWMdBjgD41l8IJOlZna(~9>efPfm-R14)R#}$5Z#m!ZyZ7JUa=!Bs>hR%f+YSWbSTx~iFdYrxD1Z(EFapFQ
z(*I@}0m7&{Y`!)rY66T;K)e&cPB3Nu4gL_oyC8lCjJMH;x9OhsA4OetrOTsA8xTeP
zJSR24V04-6Jt7Rwwp9Ffq{1!le0Pq~e6VLg~Uv;|wB3=xXw@EKOpgNa?W1g0hgf;%w;+uP0o(?uYB2cXfl1X*oW
z0vQ6l4NSiSryjwW^~ed|p4~PBMDsv&hB0tWs03=30KWjn?G#TgskSCmjX>~BG@&(i37BpG;kar8
zrS>R+G7xwZz#Z6IeLHWH}Y11X93h)sm5!)N}vV^
z>;|WPiJd!tN)K%NwA}WVRUpzk6Wd}}fao@LW-51AYkf6Npa+Z}V{~F+Id?qDCJ=nx
zgchWDQNMFjjrWzBuLLSaU@H=SOC}I$zlN6BJs`TOlnv0b
zl|VxiV7?zc$!kmHH&GIS;F%bTme_AWG^3$APaCfU%0Ym6F?y00(4*KBb#;*o1YdpV
zC=BcS4}hjbZLF531eAaq0bY*XduPynn|0>K?$9tUn-4x+=OGEU1;0!qLq0p_)!-YL|zX`|1aj>#ht2)=&Y
zLD<{03PguSVU(7k1e8D+0{kAD`%a}hH%eH%P)}%q;8|lvqG`Wp0h|)b63wgxlt7dO
zUPj;NQ)$80&%zWMN+2>@nby-FOb%m&=2ZeppacY%pG8mdFT-qs1{R346I4g+A%MPH
zf~IMaNf$`lzY}6{#F|zKR0{!Kj;`cXKkE_x1fs*b1HcW{(pDd>G%{KL2$dZ5`@$0k&CuT2`B-`35}O1o|xoYAh_L{48n4Ss05TiofBY8adX3V
z9YJurwG;%oR97D*paklf0Am@&6OQ-eItm2OX`6@?NrWiRMa+8UrfpLK4MBjJfz+u^
z&Qs0;(Qf?)go_&jjy6&WC;?fESVZx}C3X}A0>N{}eFfa~w%)q!^Q}4m24MVggPA_v
z2K-9=%R)Ryot4S_?(_MD+-_{1QYBHnf+_v$TJ4>ez*zfJTq8XlI#2PffLRJzSsfWXbbnL0uh|6=5#0E
zaFDA|AUdpf0UW6ueG-UDAVe6BJqOr#|3L%Ry$alU;oyI(K=|w&O>RhF4Rs}saveeN
zEb9a`;dR5pG+8czFaj~@B4FbAK-=;8!jN13iw^^fZp{3jVgk|m0&vimz58a(i$M3K
z-swu2LZ=v|q#La4KAcDk5^rQP=Zzq^-I@==b-_w*@LWLzLPiTRE!lsxJG?JG1>Sl#
ze?6m80wF?nNQCPhEr$WeeIvi^tDgdT-iz*K`d}Tf@{#DutM`%^cTqesuy{5g5ZsAo
zY_~Q87*p>IO47a{0#WR*y)1IdUwNm6&PoY{y^SRS8F8W2Fj9)RNhL0>hq@B21tSRc
zoD7LQ3W4a|18i9fytWv4`W|;nz&e_cv6o?K>PHoERO?`q8Xas?f(aE7F2chGfXP;q(
zqaB%A?cE(+9q+#q-XA48YigyW71WhT-R<0cV>kt`%&~WzV*hL7O9{VDoY)`J2
z`-N=JhSh_v#P(f`YF~per(~8=1;UI|B~taTLu5w~Z-DUCO4w0zb=nsQ{Wc(XaZm+9
z&tmv}f6A9Wy$(U?koMbRd-T2wL-M5*2)6~gPqvu5TB|3eVMl7R;sm%CTav?x=UNu}
zU^^bD@LUO$QXt$awIBQ{x1&_pHdo8*RI8_6E5)w~6G#^*ebSe|&`!_3U&=p6Ax=*_
zwic$$-F7qmYp(*~vy)tst3deUC<~R`Ze0UH5w|^mWj1W;D0VTTm||T27%*zUQ+BXB
z>;mS;QA$S;jrv+&Ap)TXw4&(#C
zfYUAnnuq46^|K!0T}vi~3WO;s_jGcp4r_?H@F1lG6$p2ZGNm|o4lrS2ej1rxJokWk
zkXk9n9>CYFRuzaS-s?3Y5L*DWL{VBpml1_Pm@e4aL(0iEsMizaE{2~qh+N;JGG`LN+1e>C?{e+!+QHJhKWGPU;C+7
z=STXM_Q|N>rN;*2YkIX=%DLqB{9rdGWvD=Sku~|fM@A64^q98^D~~j$0+BmRHg%MW
zz`TMY{0M~IIqZdpibuSXkMoT06$aql_;zMGVLDB4TeFbH*du-08>j*i#apvm1tJQJ
zCTkGczo>_u0{pQ5R)Ja(2vbH9)OOkrGTWEAk4&9p)L?ocjLw5B(?0$TZkaH$&2%1JdX4#!^iiIho2K$I1_Xe`uI`=ye
z7%>X4ua{)g$X2My`a{rmXg)iE9$AA(fDltQAqm(8LjG!QOJ=U)vv2Fwn?Oh?x|2)j
zYp0`zkS}Mz?CC{H-R2BP&z8+k#OHbw2$@>^ZHeyFl(mK>cNdOA{A_tf)5DEe${O{g
zjH27+1DQU@`$j7nZa=>;{6#L+HpLKz|MU#d>=M#+=O@7D9~F|eN8!p%AzQbvJ?Xq|
zk=^oqV~GZ&jpF@vD)RyB+z<<`yHCO
zaEb{-m}~5&U6bDh;+Np}sl=6Z#e_lD8Qxg|+<&!uOJrK{cmGl-$SM+kd*3WQW1$E{
zCkQv0@Dh40EP#v}lL
zR5k_#oO~T5gxt%&D|9PvRDqDu!o>4|w&R_rVdBg1=6{-ix6Jw!Co_PvKV}
za!ZpB?ED|)m%sX{;tO`B_B#Eg6(_D6Pcbc_Fr92^+TE$$O0x&=b@P%8ZcSlMY2Uy9
zz4@7sDC@4DvU;d1(VD$kOE2yX+p%E;Lh6=av-WriCZ{I7>~{K?!Nj}pw_P7{w
zanK$)blm^Q?;rnp@V{lt_K2?)x_d{_R#ThnEuHP^y~!XfueUaqwLM`4LX35qY6P8A
zJBdTssYNbO`w{To-M~jVA8l@0`v;x
z!yriBs0BhsVc(i-9-1zQ&Gnxrz5XE0925xks0`QbQ3`}u;xt^A|L+!+Nk$$goLhLb
zyi($jz58PQ>f&c5Oa(#?Xtf*${NGCNDT9c_(|TE4;1{}o{UKi<=2+9gSQ5C++@W)^lcX~DfASaMPmlWTTYJd4Vj~|Dfsi&{bjzUlnfO)swOP{-66jxl$QOuC
zG-F%rBM^;LRsjfkA3P%m{dnKYTxrLk)d)(ZhO$4Hti@S`dUR$gq
zh5)auOO~xTI5Czw(VHg_>2(M_*%=&jsRTkSlE284uXGjyyTvA_B7?WmIj2)tz1)<=
zwi~?!B73KXQ)I5(I*P@Qh`PP?UEaS^S7P9}@W2{Gzd-1AXVA_sr9g;HPFtW(;^5~Z
znxJjX=JOH;lTdM90+DN@tg{?>M)CL?Diq;*HD`KJFoMX4MC?5f*}@WstFs|;mqH-q
z13dL_ygv#%;B25+(X|hbcc|6*Rs>7=bVq3YqG>w+iUKv?8xYO;pOv
zXr@DHej<@;ucHWXyY(9oF0P4&mD9-Vhb(pGx)008Epy}C$4wyQqdVgCj35*X+UnFU
zDO19-ExIxPS6QDpX-4rOx4pbledfu+e#f@G5+?IZtO=%8eJ3Nnhd1Nlf|CjiA360^1zJEI{Zo~!TA
zEJjMZwygEyuWxqT)%*e!B0&6|RBYOb>`aBV6vwl(3z<5#C?;a3
zQ&(c8FM;SEMXUtjv|5+PNbQ%8#cd&R!)ou7gITxX9a{m3b0BK~_BDk_4Ym~~^-Ju8
z)~^7g4gr=w5WOJz5mph@4>y{fu_z^%#w~l`V3vP@=xCb;40)A97uI~sNVf@t#^mw;T16Hmys7p{-DK+GCD9!*2v0+4g*L*p{lmMeieA@C_u
zdnZu$rtP5wqJJ%79tc0J6ENBgC7=X=>!~Zzzxo_v1d$eqnHY-J*y{itqhytU5~z6s
zYjAMl80tjIt0kUOjBEj{0cE^c>hDURHVD{GY=)j<42VRBCD%y*pf)I|l}bPf6cAwC
zMe&4z`)ekr@dzS4)sU!D+pYfr5aL=U?KCBz1S&&-U&X=6N!e&oCN}sIh_pz|o)E(j
zegnV(CKYHJC7=YVg22b1Jzu4}H?Q|&jc9CNDgh->K?14NdDOjr
zv0n=U2}DLDtoa~Z=eI&luLP7pnF;t@cgVFaxIoNA6Ix=w2hof&H&?4u0!qM?0P|w>
zB)?6MqR%u-Bm$8hMRXiK4CwuXE?NdbuX&U}i3u>C12s>VEA)ca6nF%Yt&p!DcM$eA
zJrAN|gBqdvlzPinMWQ_&>{di#Y*?c-zY-tc@W36xwQ(xZv%CbS^MivXNm%EoBfN}wSK$a+K5kSpk}bv>nS
zZ&?JQe_f&pEp4{|G*55rDs{JN`E^Nvx#Uv{JGZh4#Nd=8b~*@g5S>()ov4jc0;M3p
z{2CbT)SdieDT;S1v+M$q9!+#&2)4D&1`W9tz?aI|V696D)EI#sVEhE56J4d)rSM`=
z5rG&OP0X@dF$8jKTyGNh>M8xbu?VCu)TM>!!;fh}VoRkOUr~V=5Q>i2iD29YqH`++
zLhDrmRYYJZ!2jrU+jhBatO|h`6bfq+n17-|QSR43>#Gt1O99;Mc9Cu+Y^*AQ7+lD-
zP6Oc%5GGdwiq@$F%1S`uHZbNJ1}4Br0$2v-rQn@Ug^lo3Zjv=85OzS^ZXGos7UIfH
z7+!9OTAvaaAdnd)tN>vt`gj>FNWN3cbZTB83It=$*fwxe3`{YAVjx&x8sC4>&j=8Y
z05AefBS08c%blmTmx%!56APy0xJg7oRCr$Poe7Xt<(0?(hi(B8gA3R_1o~anxRyr61*1_AGQkWw$tY?jPF$)q
z3f+jAnn=c(*p^F7QWMdBjgD41l8IJOlZna(~9>efPfm-R14)R#}$5Z#m!ZyZ7JUa=!Bs>hR%f+YSWbSTx~iFdYrxD1Z(EFapFQ
z(*I@}0m7&{Y`!)rY66T;K)e&cPB3Nu4gL_oyC8lCjJMH;x9OhsA4OetrOTsA8xTeP
zJSR24V04-6Jt7Rwwp9Ffq{1!le0Pq~e6VLg~Uv;|wB3=xXw@EKOpgNa?W1g0hgf;%w;+uP0o(?uYB2cXfl1X*oW
z0vQ6l4NSiSryjwW^~ed|p4~PBMDsv&hB0tWs03=30KWjn?G#TgskSCmjX>~BG@&(i37BpG;kar8
zrS>R+G7xwZz#Z6IeLHWH}Y11X93h)sm5!)N}vV^
z>;|WPiJd!tN)K%NwA}WVRUpzk6Wd}}fao@LW-51AYkf6Npa+Z}V{~F+Id?qDCJ=nx
zgchWDQNMFjjrWzBuLLSaU@H=SOC}I$zlN6BJs`TOlnv0b
zl|VxiV7?zc$!kmHH&GIS;F%bTme_AWG^3$APaCfU%0Ym6F?y00(4*KBb#;*o1YdpV
zC=BcS4}hjbZLF531eAaq0bY*XduPynn|0>K?$9tUn-4x+=OGEU1;0!qLq0p_)!-YL|zX`|1aj>#ht2)=&Y
zLD<{03PguSVU(7k1e8D+0{kAD`%a}hH%eH%P)}%q;8|lvqG`Wp0h|)b63wgxlt7dO
zUPj;NQ)$80&%zWMN+2>@nby-FOb%m&=2ZeppacY%pG8mdFT-qs1{R346I4g+A%MPH
zf~IMaNf$`lzY}6{#F|zKR0{!Kj;`cXKkE_x1fs*b1HcW{(pDd>G%{KL2$dZ5`@$0k&CuT2`B-`35}O1o|xoYAh_L{48n4Ss05TiofBY8adX3V
z9YJurwG;%oR97D*paklf0Am@&6OQ-eItm2OX`6@?NrWiRMa+8UrfpLK4MBjJfz+u^
z&Qs0;(Qf?)go_&jjy6&WC;?fESVZx}C3X}A0>N{}eFfa~w%)q!^Q}4m24MVggPA_v
z2K-9=%R)Ryot4S_?(_MD+-_{1QYBHnf+_v$TJ4>ez*zfJTq8XlI#2PffLRJzSsfWXbbnL0uh|6=5#0E
zaFDA|AUdpf0UW6ueG-UDAVe6BJqOr#|3L%Ry$alU;oyI(K=|w&O>RhF4Rs}saveeN
zEb9a`;dR5pG+8czFaj~@B4FbAK-=;8!jN13iw^^fZp{3jVgk|m0&vimz58a(i$M3K
z-swu2LZ=v|q#La4KAcDk5^rQP=Zzq^-I@==b-_w*@LWLzLPiTRE!lsxJG?JG1>Sl#
ze?6m80wF?nNQCPhEr$WeeIvi^tDgdT-iz*K`d}Tf@{#DutM`%^cTqesuy{5g5ZsAo
zY_~Q87*p>IO47a{0#WR*y)1IdUwNm6&PoY{y^SRS8F8W2Fj9)RNhL0>hq@B21tSRc
zoD7LQ3W4a|18i9fytWv4`W|;nz&e_cv6o?K>PHoERO?`q8Xas?f(aE7F2chGfXP;q(
zqaB%A?cE(+9q+#q-XA48YigyW71WhT-R<0cV>kt`%&~WzV*hL7O9{VDoY)`J2
z`-N=JhSh_v#P(f`YF~per(~8=1;UI|B~taTLu5w~Z-DUCO4w0zb=nsQ{Wc(XaZm+9
z&tmv}f6A9Wy$(U?koMbRd-T2wL-M5*2)6~gPqvu5TB|3eVMl7R;sm%CTav?x=UNu}
zU^^bD@LUO$QXt$awIBQ{x1&_pHdo8*RI8_6E5)w~6G#^*ebSe|&`!_3U&=p6Ax=*_
zwic$$-F7qmYp(*~vy)tst3deUC<~R`Ze0UH5w|^mWj1W;D0VTTm||T27%*zUQ+BXB
z>;mS;QA$S;jrv+&Ap)TXw4&(#C
zfYUAnnuq46^|K!0T}vi~3WO;s_jGcp4r_?H@F1lG6$p2ZGNm|o4lrS2ej1rxJokWk
zkXk9n9>CYFRuzaS-s?3Y5L*DWL{VBpml1_Pm@e4aL(0iEsMizaE{2~qh+N;JGG`LN+1e>C?{e+!+QHJhKWGPU;C+7
z=STXM_Q|N>rN;*2YkIX=%DLqB{9rdGWvD=Sku~|fM@A64^q98^D~~j$0+BmRHg%MW
zz`TMY{0M~IIqZdpibuSXkMoT06$aql_;zMGVLDB4TeFbH*du-08>j*i#apvm1tJQJ
zCTkGczo>_u0{pQ5R)Ja(2vbH9)OOkrGTWEAk4&9p)L?ocjLw5B(?0$TZkaH$&2%1JdX4#!^iiIho2K$I1_Xe`uI`=ye
z7%>X4ua{)g$X2My`a{rmXg)iE9$AA(fDltQAqm(8LjG!QOJ=U)vv2Fwn?Oh?x|2)j
zYp0`zkS}Mz?CC{H-R2BP&z8+k#OHbw2$@>^ZHeyFl(mK>cNdOA{A_tf)5DEe${O{g
zjH27+1DQU@`$j7nZa=>;{6#L+HpLKz|MU#d>=M#+=O@7D9~F|eN8!p%AzQbvJ?Xq|
zk=^oqV~GZ&jpF@vD)RyB+z<<`yHCO
zaEb{-m}~5&U6bDh;+Np}sl=6Z#e_lD8Qxg|+<&!uOJrK{cmGl-$SM+kd*3WQW1$E{
zCkQv0@Dh40EP#v}lL
zR5k_#oO~T5gxt%&D|9PvRDqDu!o>4|w&R_rVdBg1=6{-ix6Jw!Co_PvKV}
za!ZpB?ED|)m%sX{;tO`B_B#Eg6(_D6Pcbc_Fr92^+TE$$O0x&=b@P%8ZcSlMY2Uy9
zz4@7sDC@4DvU;d1(VD$kOE2yX+p%E;Lh6=av-WriCZ{I7>~{K?!Nj}pw_P7{w
zanK$)blm^Q?;rnp@V{lt_K2?)x_d{_R#ThnEuHP^y~!XfueUaqwLM`4LX35qY6P8A
zJBdTssYNbO`w{To-M~jVA8l@0`v;x
z!yriBs0BhsVc(i-9-1zQ&Gnxrz5XE0925xks0`QbQ3`}u;xt^A|L+!+Nk$$goLhLb
zyi($jz58PQ>f&c5Oa(#?Xtf*${NGCNDT9c_(|TE4;1{}o{UKi<=2+9gSQ5C++@W)^lcX~DfASaMPmlWTTYJd4Vj~|Dfsi&{bjzUlnfO)swOP{-66jxl$QOuC
zG-F%rBM^;LRsjfkA3P%m{dnKYTxrLk)d)(ZhO$4Hti@S`dUR$gq
zh5)auOO~xTI5Czw(VHg_>2(M_*%=&jsRTkSlE284uXGjyyTvA_B7?WmIj2)tz1)<=
zwi~?!B73KXQ)I5(I*P@Qh`PP?UEaS^S7P9}@W2{Gzd-1AXVA_sr9g;HPFtW(;^5~Z
znxJjX=JOH;lTdM90+DN@tg{?>M)CL?Diq;*HD`KJFoMX4MC?5f*}@WstFs|;mqH-q
z13dL_ygv#%;B25+(X|hbcc|6*Rs>7=bVq3YqG>w+iUKv?8xYO;pOv
zXr@DHej<@;ucHWXyY(9oF0P4&mD9-Vhb(pGx)008Epy}C$4wyQqdVgCj35*X+UnFU
zDO19-ExIxPS6QDpX-4rOx4pbledfu+e#f@G5+?IZtO=%8eJ3Nnhd1Nlf|CjiA360^1zJEI{Zo~!TA
zEJjMZwygEyuWxqT)%*e!B0&6|RBYOb>`aBV6vwl(3z<5#C?;a3
zQ&(c8FM;SEMXUtjv|5+PNbQ%8#cd&R!)ou7gITxX9a{m3b0BK~_BDk_4Ym~~^-Ju8
z)~^7g4gr=w5WOJz5mph@4>y{fu_z^%#w~l`V3vP@=xCb;40)A97uI~sNVf@t#^mw;T16Hmys7p{-DK+GCD9!*2v0+4g*L*p{lmMeieA@C_u
zdnZu$rtP5wqJJ%79tc0J6ENBgC7=X=>!~Zzzxo_v1d$eqnHY-J*y{itqhytU5~z6s
zYjAMl80tjIt0kUOjBEj{0cE^c>hDURHVD{GY=)j<42VRBCD%y*pf)I|l}bPf6cAwC
zMe&4z`)ekr@dzS4)sU!D+pYfr5aL=U?KCBz1S&&-U&X=6N!e&oCN}sIh_pz|o)E(j
zegnV(CKYHJC7=YVg22b1Jzu4}H?Q|&jc9CNDgh->K?14NdDOjr
zv0n=U2}DLDtoa~Z=eI&luLP7pnF;t@cgVFaxIoNA6Ix=w2hof&H&?4u0!qM?0P|w>
zB)?6MqR%u-Bm$8hMRXiK4CwuXE?NdbuX&U}i3u>C12s>VEA)ca6nF%Yt&p!DcM$eA
zJrAN|gBqdvlzPinMWQ_&>{di#Y*?c-zY-tc@W36xwQ(xZv%CbS^MivXNm%EoBfN}wSK$a+K5kSpk}bv>nS
zZ&?JQe_f&pEp4{|G*55rDs{JN`E^Nvx#Uv{JGZh4#Nd=8b~*@g5S>()ov4jc0;M3p
z{2CbT)SdieDT;S1v+M$q9!+#&2)4D&1`W9tz?aI|V696D)EI#sVEhE56J4d)rSM`=
z5rG&OP0X@dF$8jKTyGNh>M8xbu?VCu)TM>!!;fh}VoRkOUr~V=5Q>i2iD29YqH`++
zLhDrmRYYJZ!2jrU+jhBatO|h`6bfq+n17-|QSR43>#Gt1O99;Mc9Cu+Y^*AQ7+lD-
zP6Oc%5GGdwiq@$F%1S`uHZbNJ1}4Br0$2v-rQn@Ug^lo3Zjv=85OzS^ZXGos7UIfH
z7+!9OTAvaaAdnd)tN>vt`gj>FNWN3cbZTB83It=$*fwxe3`{YAVjx&x8sC4>&j=8Y
z05AefBS08c%blmTmx%!56APx&Xh}ptRA@u(S;1A?KoFhL0o$ig!lr^a9jx6zpaP%*Oa&no1S-H(05o7L6#x}v
z(}6kJ_^>~3vFuo~q#el$ws`Uldo(+LX6OGI!SumD{K4^21F-HDZYtPRaL+T)T+ux*
zkT<-hg5DJE&;VK;&I39JNE6c}uylVAn%nh|YFj}E?v-gw%-uL33|k{}w*0P^0JFd?
zLBXQe2~Ft!t|h?NzPbVNX;ycD@S`&_m$d{q>#G3~|IBOs+5&vl>Iebf`FIT$pF5#3
zwW{D;tFB#;%3(f0T(?JNP%D!0k;;l(fM1=l(Y2F_Szp}|@lk%?(Vwbmro?9TDBo%KD&b2zR0UZ(OkeR{*OV>Upz8)#^yKfAOe7(S;
zyA<<0|FH_DItL~JsF%i2MFN-DN=apXnD+Ty0n8nP-T~xPE6o9qeE}2UqCGNKe!GRm
z3gEP_E}8hdXNW!PjLcB#TxvJfN->k`yWBAhz-?!2GPj6a7L@>W4nU|Bq;w1;;JH0E
zvE^2hz*Pm`bSL0P$wNfAYLCo?%r@UjN-8Z2Rfg8B%m(q0v@~H*t6#*$7!-(R$oup!3ph6cF;eql#XG(
z-A;CH+{$}JlTN2SHDu-!(P4mlbvN;@K5vRsd<>JsP#BNU5sL
QO8@`>07*qoM6N<$f)vcF*Z=?k
literal 0
HcmV?d00001
From 1e901693c3a03a5d00d680474ea92e3ad4994c35 Mon Sep 17 00:00:00 2001
From: THK3121
Date: Tue, 19 Sep 2023 16:17:03 +0800
Subject: [PATCH 13/26] =?UTF-8?q?=E4=BA=91=E4=BB=93=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/nongKe/cloud_entrepot/index.vue | 56 ++++++++++++++++++++-----
pages/nongKe/supply_chain/supplier.vue | 13 +++---
static/images/GXSC/DW1.png | Bin 0 -> 3007 bytes
static/images/GXSC/QB.png | Bin 0 -> 2108 bytes
static/images/LHYC/DWB.png | Bin 0 -> 2824 bytes
static/images/LHYC/QB.png | Bin 1852 -> 2108 bytes
6 files changed, 53 insertions(+), 16 deletions(-)
create mode 100644 static/images/GXSC/DW1.png
create mode 100644 static/images/GXSC/QB.png
create mode 100644 static/images/LHYC/DWB.png
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 644c650..abb7d68 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -35,13 +35,15 @@
-
{{street}}
-
+
全部
@@ -246,7 +248,7 @@
里海云仓
-
+
@@ -260,6 +262,22 @@
+
+
+
+
+
+
+
+
+ 当前区域暂无云仓
+
+
+
+
@@ -269,11 +287,8 @@
-
-
+
@@ -507,7 +522,7 @@
this.flag = true
cloudWarehouse({
street_code: this.street_code,
- category_id: this.cloudList[this.current].category_id,
+ category_id: this.cloudList[this.current]?.category_id || "",
order: this.type,
keyword: this.keyword,
page_num: this.page_num
@@ -775,7 +790,7 @@
this.status = "loading"
cloudWarehouse({
street_code: this.street_code,
- category_id: this.cloudList[this.current].category_id,
+ category_id: this.cloudList[this.current]?.category_id || "",
order: this.type,
keyword: this.keyword,
page_num: this.page_num
@@ -1168,6 +1183,13 @@
.head_tit {
margin-left: 20rpx;
font-size: 40rpx;
+ // background-color: red;
+ width: 40vw;
+ white-space: nowrap;
+ overflow: hidden;
+
+ text-overflow: ellipsis;
+
// font-weight: 700;
// transform: skewX(-10deg);
}
@@ -1219,7 +1241,14 @@
}
.town_name {
- margin-right: 20rpx;
+ margin-right: 50rpx;
+ // background-color: red;
+ max-width: 15vw;
+ white-space: nowrap;
+
+ overflow: hidden;
+
+ text-overflow: ellipsis;
}
.goods_list {
@@ -1533,4 +1562,11 @@
// transform: translateX(100rpx);
}
+
+ .yuncangempty {
+ margin: 20vh 0;
+ display: flex;
+ flex-direction: column;
+ align-items: center
+ }
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 2d73a0b..3f6a627 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -36,9 +36,9 @@
-
-
+
{{street}}
@@ -1056,10 +1056,11 @@
}
.town_name {
- // overflow: hidden;
- // white-space: nowrap;
+ overflow: hidden;
+ white-space: nowrap;
/* 设置文本不换行 */
- // text-overflow: ellipsis;
+ text-overflow: ellipsis;
+ max-width: 25vw;
font-size: 14px;
/* 设置溢出文本为省略号 */
}
diff --git a/static/images/GXSC/DW1.png b/static/images/GXSC/DW1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec346ae9300594eafd00fa616e1a9cf0c22ff28c
GIT binary patch
literal 3007
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
Date: Tue, 19 Sep 2023 16:17:48 +0800
Subject: [PATCH 14/26] =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=85=A5=E9=A9=BB?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=E5=BC=B9=E7=AA=97=EF=BC=8C?=
=?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=96=B0=E5=A2=9E=E4=BA=A4=E6=98=93?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD(=E8=AE=B0=E5=BD=95?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=81=E7=94=B3=E8=AF=B7=E5=90=8C=E6=84=8F?=
=?UTF-8?q?=E3=80=81=E6=8B=92=E7=BB=9D=E5=8A=9F=E8=83=BD=E7=AD=89=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/product.js | 152 ++++++++---
api/store.js | 7 +
api/user.js | 3 +-
config/app.js | 10 +-
manifest.json | 4 +-
pages.json | 12 +
pages/guide/guide.vue | 4 +-
pages/moreProject/moreProject.vue | 47 +++-
pages/store/settled/index.vue | 302 ++++++++++++++++-----
uni_modules/uview-ui/libs/config/config.js | 3 +-
10 files changed, 427 insertions(+), 117 deletions(-)
diff --git a/api/product.js b/api/product.js
index 547c66e..8bfa886 100644
--- a/api/product.js
+++ b/api/product.js
@@ -17,14 +17,14 @@ export const getProductDetailsAPI = (data) => request.get('micro/product_details
/**
*商品列表
*/
-export const spuInfo = (id,data) => request.get('product/spu/street/'+id, data)
+export const spuInfo = (id, data) => request.get('product/spu/street/' + id, data)
/**
* 线下导入
*/
-export function postImport(merid,data) {
- return request.post(`server/${merid}/product/stockIn`, data);
+export function postImport(merid, data) {
+ return request.post(`server/${merid}/product/stockIn`, data);
}
/**
* 获取商户基本信息 http://127.0.0.1:8324/api/store/merchant/info?id=4
@@ -38,20 +38,26 @@ export const merchantUpdateAPI = (data) => request.post('store/merchant/update',
* 商品列表
*/
export function productLstApi(merId, data) {
- return request.get(`server/${merId}/product/lst`, data, { login: true });
+ return request.get(`server/${merId}/product/lst`, data, {
+ login: true
+ });
}
/**
* 商品列表 -- 删除
*/
export function productDeleteApi(merId, id) {
- return request.post(`server/${merId}/product/delete/${id}`, {}, { login: true });
+ return request.post(`server/${merId}/product/delete/${id}`, {}, {
+ login: true
+ });
}
/**
* 商品列表 -- 上下架
*/
export function productOffApi(merId, id, data) {
- return request.post(`server/${merId}/product/status/${id}`, data, { login: true });
+ return request.post(`server/${merId}/product/status/${id}`, data, {
+ login: true
+ });
}
/*
@@ -59,7 +65,9 @@ export function productOffApi(merId, id, data) {
*/
export function productTitle(merId, data) {
- return request.get(`server/${merId}/product/title`, data, { login: true });
+ return request.get(`server/${merId}/product/title`, data, {
+ login: true
+ });
}
/*
@@ -67,7 +75,9 @@ export function productTitle(merId, data) {
*/
export function productDestory(merId, id, data) {
- return request.post(`server/${merId}/product/destory/${id}`, data, { login: true });
+ return request.post(`server/${merId}/product/destory/${id}`, data, {
+ login: true
+ });
}
/*
@@ -75,7 +85,9 @@ export function productDestory(merId, id, data) {
*/
export function productRestore(merId, id) {
- return request.post(`server/${merId}/product/restore/${id}`, {}, { login: true });
+ return request.post(`server/${merId}/product/restore/${id}`, {}, {
+ login: true
+ });
}
/*
@@ -83,7 +95,9 @@ export function productRestore(merId, id) {
*/
export function categoryBrandlist(merId) {
- return request.get(`server/${merId}/category/brandlist`, {}, { login: true });
+ return request.get(`server/${merId}/category/brandlist`, {}, {
+ login: true
+ });
}
/*
@@ -91,7 +105,9 @@ export function categoryBrandlist(merId) {
*/
export function categorySelect(merId) {
- return request.get(`server/${merId}/category/select`, {}, { login: true })
+ return request.get(`server/${merId}/category/select`, {}, {
+ login: true
+ })
}
/*
@@ -99,7 +115,9 @@ export function categorySelect(merId) {
*/
export function categoryList(merId) {
- return request.get(`server/${merId}/category/list`, {}, { login: true })
+ return request.get(`server/${merId}/category/list`, {}, {
+ login: true
+ })
}
/*
@@ -107,13 +125,17 @@ export function categoryList(merId) {
*/
export function productCreate(merId, data) {
- return request.post(`server/${merId}/product/create`, data, { login: true })
+ return request.post(`server/${merId}/product/create`, data, {
+ login: true
+ })
}
/**
* 商品列表 -- 设置推荐
*/
export function productRecommendApi(merId, id, data) {
- return request.post(`server/${merId}/product/good/${id}`, data, { login: true });
+ return request.post(`server/${merId}/product/good/${id}`, data, {
+ login: true
+ });
}
/*
@@ -121,119 +143,181 @@ export function productRecommendApi(merId, id, data) {
*/
export function attrList(merId, data) {
- return request.get(`server/${merId}/attr/lst`, data, { login: true })
+ return request.get(`server/${merId}/attr/lst`, data, {
+ login: true
+ })
}
/*
请求运费模板
*/
export function templateList(merId, data) {
- return request.get(`server/${merId}/template/lst`, data, { login: true })
+ return request.get(`server/${merId}/template/lst`, data, {
+ login: true
+ })
}
/*
运费模板 -- 删除
*/
export function templateDelete(merId, data) {
- return request.post(`server/${merId}/template/delete`, data, { login: true })
+ return request.post(`server/${merId}/template/delete`, data, {
+ login: true
+ })
}
/**
* 运费模板 -- 详情
*/
export function templateDetail(merId, id) {
- return request.get(`server/${merId}/template/detail/${id}`, {}, { login: true });
+ return request.get(`server/${merId}/template/detail/${id}`, {}, {
+ login: true
+ });
}
/*
运费模板 -- 添加
*/
export function templateCreate(merId, data) {
- return request.post(`server/${merId}/template/create`, data, { login: true });
+ return request.post(`server/${merId}/template/create`, data, {
+ login: true
+ });
}
/*
运费模板 -- 编辑
*/
export function templateUpdate(merId, id, data) {
- return request.post(`server/${merId}/template/update/${id}`, data, { login: true });
+ return request.post(`server/${merId}/template/update/${id}`, data, {
+ login: true
+ });
}
/**
* 店铺分类 -- 列表
*/
export function storeClassifyLst(merId) {
- return request.get(`server/${merId}/category/lst`, {}, { login: true });
+ return request.get(`server/${merId}/category/lst`, {}, {
+ login: true
+ });
}
/**
* 店铺分类 -- 列表(删除)
*/
export function storeClassifyDel(merId, id) {
- return request.post(`server/${merId}/category/delete/${id}`, {}, { login: true });
+ return request.post(`server/${merId}/category/delete/${id}`, {}, {
+ login: true
+ });
}
/**
* 上级分类 -- 商户列表
*/
export function merClassifyLst(merId) {
- return request.get(`server/${merId}/category/select`, {}, { login: true });
+ return request.get(`server/${merId}/category/select`, {}, {
+ login: true
+ });
}
/**
* 店铺分类 -- 添加
*/
export function merClassifyAdd(merId, data) {
- return request.post(`server/${merId}/category/create`, data, { login: true });
+ return request.post(`server/${merId}/category/create`, data, {
+ login: true
+ });
}
/**
* 店铺分类 -- 详情
*/
export function merClassifyDetail(merId, id) {
- return request.get(`server/${merId}/category/detail/${id}`, {}, { login: true });
+ return request.get(`server/${merId}/category/detail/${id}`, {}, {
+ login: true
+ });
}
/**
* 店铺分类 -- 编辑
*/
export function merClassifyUpdate(merId, id, data) {
- return request.post(`server/${merId}/category/update/${id}`, data, { login: true });
+ return request.post(`server/${merId}/category/update/${id}`, data, {
+ login: true
+ });
}
/**
* 商品规格项目 -- 列表
*/
export function specificationLst(merId, data) {
- return request.get(`server/${merId}/attr/lst`, data, { login: true });
+ return request.get(`server/${merId}/attr/lst`, data, {
+ login: true
+ });
}
/**
* 商品规格项目 -- 删除
*/
export function specificationDel(merId, data) {
- return request.post(`server/${merId}/attr/delete`, data, { login: true });
+ return request.post(`server/${merId}/attr/delete`, data, {
+ login: true
+ });
}
/**
* 商品规格项目 -- 添加
*/
export function specificationAdd(merId, data) {
- return request.post(`server/${merId}/attr/create`, data, { login: true });
+ return request.post(`server/${merId}/attr/create`, data, {
+ login: true
+ });
}
/**
* 商品规格项目 -- 编辑
*/
export function specificationUpdate(merId, id, data) {
- return request.post(`server/${merId}/attr/update/${id}`, data, { login: true });
+ return request.post(`server/${merId}/attr/update/${id}`, data, {
+ login: true
+ });
}
/**
* 商品规格项目 -- 详情
*/
export function specificationDetail(merId, id) {
- return request.get(`server/${merId}/attr/detail/${id}`, {}, { login: true });
+ return request.get(`server/${merId}/attr/detail/${id}`, {}, {
+ login: true
+ });
}
/*
请求商品详情
*/
export function productDetail(merId, id) {
- return request.get(`server/${merId}/product/detail/${id}`, {}, { login: true });
+ return request.get(`server/${merId}/product/detail/${id}`, {}, {
+ login: true
+ });
}
/*
编辑商品
*/
export function productUpdate(merId, id, data) {
- return request.post(`server/${merId}/product/update/${id}`, data, { login: true });
+ return request.post(`server/${merId}/product/update/${id}`, data, {
+ login: true
+ });
}
/*
添加商品 -- 获取送货方式信息
*/
export function getDeliveryType(merId) {
- return request.get(`server/${merId}/product/config`, {}, { login: true });
+ return request.get(`server/${merId}/product/config`, {}, {
+ login: true
+ });
+}
+
+/*
+ 商品 -- 获取交易协议内容
+*/
+export function business() {
+ return request.get(`business/agree?type=business_apply_agree`, {}, {
+ noAuth: true
+ });
+}
+/*
+ 商品 -- 获取交易申请记录
+*/
+export function intention(data) {
+ return request.get(`intention/lst`, data);
+}
+
+/*
+ 商品 -- 同意提交申请
+*/
+export function intentionbus(data) {
+ return request.post(`intention/business`, {});
}
\ No newline at end of file
diff --git a/api/store.js b/api/store.js
index 1b566c2..399e35a 100644
--- a/api/store.js
+++ b/api/store.js
@@ -572,4 +572,11 @@ export function supAgoodsApi(data) {
// }
export function vicinityStoreApi(data) {
return request.get(`region/${data}/merchant`);
+}
+
+/*
+ 商家入驻 -- 获取商户入驻申请协议内容
+*/
+export function agreeiness() {
+ return request.get(`business/agree?type=sys_intention_agree`, {}, { noAuth: true });
}
\ No newline at end of file
diff --git a/api/user.js b/api/user.js
index 1f1fce7..0009c40 100644
--- a/api/user.js
+++ b/api/user.js
@@ -719,4 +719,5 @@ export function getBankInfo() {
// 商户账单管理
export function getBillDetil() {
return request.get(`mer/financial_record`)
-}
\ No newline at end of file
+}
+
diff --git a/config/app.js b/config/app.js
index 5261574..a45360a 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,8 +9,8 @@ let httpApiThree
// 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' // 测试
if (process.env.NODE_ENV === "development") {
- httpApi = 'https://shop.lihaink.cn' // 生产
- // httpApi = "https://crmeb-test.shop.lihaink.cn"
+ // httpApi = 'https://shop.lihaink.cn' // 生产
+ httpApi = "https://crmeb-test.shop.lihaink.cn"
// httpApi = "http://192.168.0.222"
// httpApi = "http://192.168.0.108:8325"
// httpApi = 'http://192.168.0.108:8325'
@@ -22,11 +22,11 @@ if (process.env.NODE_ENV === "development") {
// httpApiTwo = "baseUrl" // h5跨域配置
httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置
// httpApiThree = 'baseUrlTest' // h5跨域配置
+
// #endif
} else if (process.env.NODE_ENV === 'production') {
- httpApi = 'https://shop.lihaink.cn' // 生产
-
- // httpApi = "https://crmeb-test.shop.lihaink.cn"
+ // httpApi = 'https://shop.lihaink.cn' // 生产
+ httpApi = "https://crmeb-test.shop.lihaink.cn"
httpApiTwo = 'https://nk.lihaink.cn' // 生产
httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
}
diff --git a/manifest.json b/manifest.json
index 0712ed8..da3dd97 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "惠农生活",
"appid" : "__UNI__3A527D1",
"description" : "",
- "versionName" : "1.3.8",
- "versionCode" : 138,
+ "versionName" : "1.3.9",
+ "versionCode" : 139,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index dfca1ac..5b6a41a 100644
--- a/pages.json
+++ b/pages.json
@@ -1123,6 +1123,18 @@
"navigationBarTitleText": "商品管理",
"enablePullDownRefresh": true
}
+ },{
+ "path": "transactionApplication/index",
+ "style": {
+ "navigationBarTitleText": "交易申请",
+ "enablePullDownRefresh": true
+ }
+ },{
+ "path": "transactionApplication/application",
+ "style": {
+ "navigationBarTitleText": "申请记录",
+ "enablePullDownRefresh": true
+ }
},
{
"path": "goodsOnSale/index",
diff --git a/pages/guide/guide.vue b/pages/guide/guide.vue
index 24e0323..63cdbba 100644
--- a/pages/guide/guide.vue
+++ b/pages/guide/guide.vue
@@ -66,7 +66,7 @@
},
mounted() {
-this.countDown()
+ this.countDown()
},
methods: {
@@ -74,7 +74,7 @@ this.countDown()
let {
num
} = this;
- if (num === 3) this.nums = true;
+ // if (num === 3) this.nums = true;
num = num > 0 ? num - 1 : "GO";
setTimeout(() => {
this.num = num;
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 7168af5..dc28772 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -1,7 +1,7 @@
-
+
市级供应链
@@ -37,6 +37,12 @@
商户设置
+
+
+
+ 交易申请
+
@@ -91,7 +97,7 @@
我的店铺
-
-
-
+
-
-
-
-
-
-
- {{town}}里海云仓
+
+
+
+
+
+
+ {{town}}里海云仓
+
+
+
+
+
+
+
+
+ {{street}}
+
+
+
+
+ 全部
+
+
+
+
+
+
+
+
+
+
+ 供销综合云市场
+
+
+ 供销综合云商品
+
-
-
- 全部
-
-
-
+
+
+
+
+
@@ -67,8 +100,8 @@
-
-
+
+
-
+
-
-
-
-
- {{item.tit}}
-
-
-
-
+
+
+
+ {{item.tit}}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- {{item.store_info}}
-
-
-
- {{item.rate}}
- {{item.reply_count}}评论
-
-
-
-
- ￥{{item.price}}
-
-
- ￥30.00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
- 暂无商品
-
-
-
-
-
-
+
-
-
-
-
- {{goodsNum}}
-
-
-
-
- ￥{{totalMoney}}
-
-
- 支持配送 售后无忧
-
-
+
- 去结算
+
+
+ {{item.store_info}}
+
+
+
+ {{item.rate}}
+ {{item.reply_count}}评论
+
+
+
+
+ ￥{{item.price}}
+
+
+ ￥30.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无商品
+
-
+
+
+
+
+
+
+
+ {{goodsNum}}
+
+
+
+
+ ￥{{totalMoney}}
+
+
+ 支持配送 售后无忧
+
+
+
+
+ 去结算
+
+
+
+
-
-
-
-
-
-
-
- 里海云仓
+
+
+
+
+
+
+
+ 里海云仓
+
-
-
-
-
-
-
- {{item.category_name}}云仓服务
-
-
- {{item.description}}
+
+
+
+
+
+ {{item.category_name}}云仓服务
+
+
+ {{item.description}}
+
+
+
+
+
+
+
+
+
+ 当前区域暂无云仓
+
+
+
+
-
+
+
+
-
+
-
-
-
-
-
- 当前区域暂无云仓
+
+
+
+ 当前区域暂无云仓
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
@@ -282,8 +333,6 @@
-
-
尺码
@@ -292,7 +341,6 @@
{{item.sku}}
-
@@ -304,9 +352,7 @@
-
确定
-
@@ -314,19 +360,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -350,13 +383,27 @@
import {
goShopDetail
} from '@/libs/order.js'
+ // 7200 = 8 = 80000 8616
import {
postCartAdd,
} from '@/api/store.js';
import authorize from '@/components/Authorize';
+
+ import {
+ getArea,
+ getStreet
+ } from '@/api/article.js';
+ import {
+ getIndexData,
+ getDiy
+ } from '@/api/api.js'
+ import {
+ getGeocoder
+ } from '@/api/store.js';
import {
mapGetters
- } from "vuex";
+ } from 'vuex'
+ import Cache from '@/utils/cache';
export default {
components: {
authorize,
@@ -364,10 +411,10 @@
data() {
let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
return {
- skuform: {
-
-
- },
+ skuform: {},
+ defaInd: [0, 0],
+ showPicker: false,
+ columnData: [],
skusize: 0,
skuNumber: 1,
showcartpop: false,
@@ -383,10 +430,12 @@
isEmpty: false,
winHeight: 0,
cloudList: [],
+ street: '',
street_code: '',
totalMoney: 0,
town: '',
list: [1, 1, 1, 1, 1],
+ showSelect: false,
showPop: false,
keyword: "",
showLoading: false,
@@ -430,10 +479,40 @@
this.street_code = e.street
this.town = e.town
this.getCloundShop()
+ this.street = e.town
+ this.Area()
+ let that = this
+ setTimeout(() => {
+ uni.createSelectorQuery()
+ .in(this)
+ .select('.flags')
+ .boundingClientRect(rect => {
+ that.headtop = rect.top
+ })
+ .exec();
+ uni.createSelectorQuery()
+ .in(this)
+ .select('.flags')
+ .boundingClientRect(rect => {
+ this.headtop = rect.top
+ })
+ .exec();
+ uni.createSelectorQuery()
+ .in(this)
+ .select('.cart')
+ .boundingClientRect(rect => {
+ // console.log(this.cartTagInfo, 6666)
+ this.cartTagInfo = rect
+ })
+ .exec();
+ // console.log(that.headtop)
+ }, 500)
+
// console.log(this.appInfo, "手机信息")
},
onShow() {
this.cartFn()
+ this.showSelect = false
},
// 分页
onReachBottom() {
@@ -443,7 +522,7 @@
this.flag = true
cloudWarehouse({
street_code: this.street_code,
- category_id: this.cloudList[this.current].category_id,
+ category_id: this.cloudList[this.current]?.category_id || "",
order: this.type,
keyword: this.keyword,
page_num: this.page_num
@@ -472,8 +551,6 @@
// }
// })
},
-
-
onPageScroll(e) {
let that = this
this.showtit = !Boolean(e.scrollTop)
@@ -494,22 +571,6 @@
}
})
.exec();
- if (this.headtop) return
- uni.createSelectorQuery()
- .in(this)
- .select('.flags')
- .boundingClientRect(rect => {
- this.headtop = rect.top
- })
- .exec();
- uni.createSelectorQuery()
- .in(this)
- .select('.cart')
- .boundingClientRect(rect => {
- this.cartTagInfo = rect
- })
- .exec();
-
},
onPullDownRefresh() {
this.getCloundShop()
@@ -517,11 +578,94 @@
this.cartFn()
uni.stopPullDownRefresh()
},
- // onReachBottom() {
- // console.log("daidi")
-
- // },
methods: {
+ showpick() {
+ this.showPicker = !this.showPicker
+
+
+ },
+ swiperClick(item) {
+ const url = item.info[1].value
+ uni.navigateTo({
+ url: url
+ })
+ },
+ selectLocation() {
+ this.isSelectPlace ? this.showPicker = true : ''
+
+ },
+
+ confirm(e) {
+ this.showPicker = false
+ this.$emit('selectPlce', e)
+ this.$emit('change', e)
+ this.street = e.value[1].name
+ this.$nextTick(() => {
+ this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
+ })
+
+ // this.sotreParam.street_id = e.value[1].code
+ this.street_code = e.value[1].code
+ this.getCloundShop()
+ this.town = e.value[1].name
+ // this.storeMerchantList()
+
+ },
+ changeHandler(e) {
+ const {
+ columnIndex,
+ value,
+ values,
+ index,
+ picker = this.$refs.uPicker
+ } = e;
+ if (columnIndex === 0) {
+ getStreet({
+ area_code: value[0]['code']
+ }).then(res => {
+ picker.setColumnValues(1, res.data);
+ });
+ }
+ },
+ Area() {
+ let that = this
+ getArea({
+ city_code: 510500
+ }).then(res => {
+
+ this.$refs.uPicker.setColumnValues(0, res.data);
+ this.Street(res.data[0]['code']);
+ // console.log(res.data, 66666)
+ });
+ },
+ Street(code) {
+ getStreet({
+ area_code: code
+ }).then(res => {
+ this.$refs.uPicker.setColumnValues(1, res.data);
+
+ });
+ },
+
+ swiperChange(e) {
+ let {
+ current,
+ source
+ } = e.detail;
+ if (source === 'autoplay' || source === 'touch') {
+ this.bgColor = this.swiper.url[e.detail.current]['img']
+ this.$emit('kkchange', this.bgColor)
+ }
+ },
+
+
+ // 对象转数组
+ objToArr(data) {
+ let obj = Object.keys(data).sort();
+ let m = obj.map(key => data[key]);
+ return m;
+ },
skusizechange(i) {
this.skusize = i
@@ -554,9 +698,8 @@
},
valChange(e) {
- console.log(e.value)
this.skuNumber = e.value
- // this.valChange = e.value
+
},
closecartpop() {
this.showcartpop = false
@@ -578,7 +721,7 @@
},
cartFn() {
getCartList().then(res => {
- console.log(res)
+ // console.log(res)
this.totalMoney = 0
this.cartList = res.data.list
this.cartList.forEach(e => {
@@ -594,7 +737,7 @@
this.goodsNum = res.data[0].count
})
},
- godDetail(item) {
+ goodDetail(item) {
goShopDetail(item, this.uid).then(res => {
if (this.isLogin) {
initiateAssistApi(item.activity_id).then(res => {
@@ -617,7 +760,6 @@
})
},
serch() {
- // console.log(this.keyword)
this.getList()
},
goBack() {
@@ -648,7 +790,7 @@
this.status = "loading"
cloudWarehouse({
street_code: this.street_code,
- category_id: this.cloudList[this.current].category_id,
+ category_id: this.cloudList[this.current]?.category_id || "",
order: this.type,
keyword: this.keyword,
page_num: this.page_num
@@ -666,14 +808,12 @@
},
addcart(item, i) {
-
- // console.log(this.isLogin)
if (!this.isLogin) {
this.isAuto = true;
this.isShowAuth = true
return
}
- // console.log(item.sku[''] ? "1" : "2")
+
if (item.sku['']) {
let data = {
cart_num: 1,
@@ -683,14 +823,11 @@
product_type: item.product_type,
spread_id: "",
}
-
let that = this
- // return
-
uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
that.trnList[i].left = this.cartTagInfo.left - data1.left;
that.trnList[i].bottom = this.cartTagInfo.top - data1.top;
- console.log(that.trnList[i])
+
let timer = setTimeout(() => {
that.trnList[i].left = 0
that.trnList[i].bottom = 0
@@ -710,7 +847,6 @@
})
}).catch(err => {
- // this.act_cart = false
uni.showToast({
title: err,
icon: "none",
@@ -725,11 +861,8 @@
this.showcartpop = true
const keys = Object.keys(item.sku);
const firstKey = keys[0];
-
-
- // console.log(keys[0])
this.skusize = keys[0]
- // console.log(this.skuform)
+
}
return
@@ -758,6 +891,7 @@
street_code: this.street_code,
category_id: this.cloudList[this.current].category_id
}).then(res => {
+ this.trnList = []
this.goodsList = res.data.list
this.goodsList.forEach(item => {
this.trnList.push({
@@ -766,8 +900,6 @@
})
})
})
- // console.log(this.cloudList)
- data.length < 1 ? Toast("暂无云仓") : '';
}
}
}
@@ -786,6 +918,39 @@
}
}
+ .selected-list {
+ padding: 24rpx 14rpx;
+ border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+ background-color: #fff;
+ position: absolute;
+ left: 100rpx;
+ font-size: 29.79rpx;
+ z-index: 9999;
+ // top: 100rpx;
+ opacity: 0;
+ transition: 0.5s;
+
+
+
+ .triangle-up {
+ width: 0;
+ height: 0;
+ border-left: 10rpx solid transparent;
+ border-right: 10rpx solid transparent;
+ border-bottom: 10rpx solid white;
+ position: absolute;
+ top: -10rpx;
+ }
+
+ .selected-li {
+ margin-top: 35rpx;
+ color: #F84221;
+ display: flex;
+ align-items: center;
+ }
+ }
+
+
.sku {
padding: 20rpx;
@@ -1018,8 +1183,15 @@
.head_tit {
margin-left: 20rpx;
font-size: 40rpx;
+ // background-color: red;
+ width: 40vw;
+ white-space: nowrap;
+ overflow: hidden;
+
+ text-overflow: ellipsis;
+
// font-weight: 700;
- transform: skewX(-10deg);
+ // transform: skewX(-10deg);
}
@@ -1029,7 +1201,7 @@
.head {
position: fixed;
- z-index: 100;
+ z-index: 999;
color: white;
display: flex;
justify-content: space-between;
@@ -1068,6 +1240,17 @@
}
+ .town_name {
+ margin-right: 50rpx;
+ // background-color: red;
+ max-width: 15vw;
+ white-space: nowrap;
+
+ overflow: hidden;
+
+ text-overflow: ellipsis;
+ }
+
.goods_list {
min-height: 95vh;
padding: 0 10rpx;
@@ -1232,91 +1415,91 @@
height: 35rpx;
}
- .cloud_entrepot {
- background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
- background-size: cover;
- padding-bottom: 92.98rpx;
- }
+ // .cloud_entrepot {
+ // background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
+ // background-size: cover;
+ // padding-bottom: 92.98rpx;
+ // }
- .head-wrapper {
- height: 485.96rpx;
- width: 100%;
- background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
- background-size: cover;
- margin-bottom: 49.12rpx;
- }
+ // .head-wrapper {
+ // height: 485.96rpx;
+ // width: 100%;
+ // background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
+ // background-size: cover;
+ // margin-bottom: 49.12rpx;
+ // }
- .town-title {
- margin: 0 auto;
- width: 100%;
- text-align: center;
- font-size: 50.88rpx;
- color: #fff;
- margin-bottom: 28.07rpx;
+ // .town-title {
+ // margin: 0 auto;
+ // width: 100%;
+ // text-align: center;
+ // font-size: 50.88rpx;
+ // color: #fff;
+ // margin-bottom: 28.07rpx;
- &::after {
- content: '';
- display: inline-block;
- width: 66.67rpx;
- height: 31.58rpx;
- background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
- background-size: cover;
- margin-left: 24.56rpx;
- }
+ // &::after {
+ // content: '';
+ // display: inline-block;
+ // width: 66.67rpx;
+ // height: 31.58rpx;
+ // background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
+ // background-size: cover;
+ // margin-left: 24.56rpx;
+ // }
- &::before {
- content: '';
- display: inline-block;
- width: 66.67rpx;
- height: 31.58rpx;
- background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
- background-size: cover;
- margin-right: 24.56rpx;
- }
- }
+ // &::before {
+ // content: '';
+ // display: inline-block;
+ // width: 66.67rpx;
+ // height: 31.58rpx;
+ // background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
+ // background-size: cover;
+ // margin-right: 24.56rpx;
+ // }
+ // }
- .body-wrapper {
- width: 694.74rpx;
- display: flex;
- justify-content: space-between;
- flex-wrap: wrap;
- margin: 0 auto;
+ // .body-wrapper {
+ // width: 694.74rpx;
+ // display: flex;
+ // justify-content: space-between;
+ // flex-wrap: wrap;
+ // margin: 0 auto;
- .item {
- width: 336.84rpx;
- height: 100%;
- padding: 24.56rpx 28.07rpx;
- margin-bottom: 21.05rpx;
- background-repeat: no-repeat;
- background-size: 100% 100%;
- box-sizing: border-box;
+ // .item {
+ // width: 336.84rpx;
+ // height: 100%;
+ // padding: 24.56rpx 28.07rpx;
+ // margin-bottom: 21.05rpx;
+ // background-repeat: no-repeat;
+ // background-size: 100% 100%;
+ // box-sizing: border-box;
- text {
- display: block;
- font-size: 24.56rpx;
- color: #999;
- margin-bottom: 14.04rpx;
- }
+ // text {
+ // display: block;
+ // font-size: 24.56rpx;
+ // color: #999;
+ // margin-bottom: 14.04rpx;
+ // }
- .item-title {
- font-size: 31.58rpx;
- color: #333;
- }
+ // .item-title {
+ // font-size: 31.58rpx;
+ // color: #333;
+ // }
- .chakan-btn {
- width: 114.04rpx;
- height: 49.12rpx;
- font-size: 28.07rpx;
- text-align: center;
- line-height: 49.12rpx;
- color: #fff;
- margin-top: auto;
- background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
- border-radius: 50px;
- }
- }
- }
+ // .chakan-btn {
+ // width: 114.04rpx;
+ // height: 49.12rpx;
+ // font-size: 28.07rpx;
+ // text-align: center;
+ // line-height: 49.12rpx;
+ // color: #fff;
+ // margin-top: auto;
+ // background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
+ // border-radius: 50px;
+ // }
+ // }
+ // }
.empty {
// display: flex;
@@ -1363,4 +1546,27 @@
display: flex;
align-items: center;
}
+
+ .sl {
+ margin-left: 20rpx;
+ transform: rotate(180deg);
+ transition: 0.5s;
+ }
+
+ .actsl {
+ transform: rotate(0deg);
+ }
+
+ .actSel {
+ opacity: 1;
+ // transform: translateX(100rpx);
+
+ }
+
+ .yuncangempty {
+ margin: 20vh 0;
+ display: flex;
+ flex-direction: column;
+ align-items: center
+ }
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 1a8578b..3f6a627 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -14,21 +14,44 @@
-
+
供销综合云市场
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{street}}
+
+
+
+
+
+ 供销综合云市场
+
+
+ 供销综合云商品
@@ -36,12 +59,13 @@
-
+
- 热搜: 小张副食 正新酒店
+ 热搜:
+ 小张副食
+ 正新酒店
麻辣鸡
手撕椒麻鸡
@@ -274,6 +298,11 @@
+
+
+
+
@@ -303,6 +332,18 @@
configMap
} from '@/utils';
import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+ import {
+ getArea,
+ getStreet
+ } from '@/api/article.js';
+ import {
+ getIndexData,
+ getDiy
+ } from '@/api/api.js'
+
+
+
+ import Cache from '@/utils/cache';
const app = getApp();
export default {
components: {
@@ -312,6 +353,9 @@
},
data() {
return {
+ defaInd: [0, 0],
+ columnData: [],
+ showSerch: false,
imgList: [
"/static/images/GXSC/BBY.png",
"/static/images/GXSC/NYSC.png",
@@ -331,6 +375,7 @@
"/static/images/GXSC/JDMS.png",
],
street_id: "",
+ showSelect: false,
price: 0,
stock: 0,
nows: false,
@@ -348,6 +393,8 @@
downKey: 0,
downStatus: false,
menuList: [],
+ street: "",
+ showPicker: false,
// 下拉菜单
downMenu: [{
title: '默认',
@@ -406,6 +453,7 @@
onLoad(options) {
// console.log(options);
this.street_id = options.street_id
+ this.street = options.townName
this.product_type = options.product_type ?? 0
if (options.street_id != undefined) {
this.sotreParam.street_id = options.street_id
@@ -424,7 +472,7 @@
supMenuApi().then(res => {
this.menuList = res.data
})
-
+ this.Area()
},
computed: {
downMenus: function() {
@@ -445,11 +493,103 @@
}, mapGetters(['viewColor'])),
},
methods: {
+ selectLocation() {
+ this.isSelectPlace ? this.showPicker = true : ''
+
+ },
+ confirm(e) {
+ this.showPicker = false
+ this.$emit('selectPlce', e)
+ this.$emit('change', e)
+ this.street = e.value[1].name
+ this.$nextTick(() => {
+ this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
+ })
+ this.sotreParam.street_id = e.value[1].code
+ this.street_id = e.value[1].code
+ this.storeMerchantList()
+ },
+ changeHandler(e) {
+ const {
+ columnIndex,
+ value,
+ values,
+ index,
+ picker = this.$refs.uPicker
+ } = e;
+ if (columnIndex === 0) {
+ getStreet({
+ area_code: value[0]['code']
+ }).then(res => {
+ picker.setColumnValues(1, res.data);
+ });
+ }
+ },
+ Area() {
+ getArea({
+ city_code: 510500
+ }).then(res => {
+ this.$refs.uPicker.setColumnValues(0, res.data);
+ // this.Street(res.data[0]['code']);
+ // console.log(res.data, 66666)
+ });
+ },
+ Street(code) {
+ getStreet({
+ area_code: code
+ }).then(res => {
+ this.$refs.uPicker.setColumnValues(1, res.data);
+ console.log(res.data, 9999)
+ });
+ },
+
+ swiperChange(e) {
+ let {
+ current,
+ source
+ } = e.detail;
+ if (source === 'autoplay' || source === 'touch') {
+ this.bgColor = this.swiper.url[e.detail.current]['img']
+ this.$emit('kkchange', this.bgColor)
+ }
+ },
+
+ onInputConfirm() {
+
+ this.showSerch = false
+ this.searchSubmit()
+
+ },
+ // 对象转数组
+ objToArr(data) {
+ let obj = Object.keys(data).sort();
+ let m = obj.map(key => data[key]);
+ return m;
+ },
+ async getBanner(id) {
+ let that = this;
+ const {
+ data
+ } = await getDiy({
+ id: 0
+ })
+ that.styleConfig = that.objToArr(data.value);
+ /* 循环数组得到数据*/
+ that.styleConfig.forEach((item, index, arr) => {
+ if (item.name == 'headerSerch' || item.name == 'homeComb') {
+ if (item.name == 'homeComb') {
+ that.swiper.url = item.swiperConfig.list
+ }
+ }
+ })
+ this.bgColor = this.swiper.url[0].img
+ },
+
test() {
if (this.sotreParam.keyword.length > 3) {
this.sotreParam.keyword.slice(0, 3)
this.sotreParam.keyword = this.sotreParam.keyword.slice(0, 3) + "..."
- console.log(this.sotreParam.keyword)
}
// console.log(this.sotreParam.keyword.length)
},
@@ -462,6 +602,11 @@
url
})
},
+ navGoto(url) {
+ uni.redirectTo({
+ url
+ })
+ },
navGo(id) {
uni.navigateTo({
url: `/pages/nongKe/supply_chain/supplierA?type_id=10&merchant_category_id=${id}&street_id=${this.street_id}`
@@ -644,7 +789,7 @@
// console.log(rqData)
storeMerchantList(rqData).then(res => {
this.count = res.data.count
- this.storeList = this.storeList.concat(res.data.list)
+ this.storeList = (res.data.list)
this.loading = false
this.loadingIcon = false
})
@@ -667,6 +812,7 @@
let that = this;
that.$set(that.sotreParam, 'keyword', this.sotreParam.keyword);
this.set_where(this.firstKey)
+ this.showSerch = false
},
// 右侧切换
bindRight() {
@@ -674,7 +820,7 @@
this.rightBox = true
},
// 组件确定
- confirm(data) {
+ confirm1(data) {
let arr1 = [],
arr2 = []
if (data.storeTypeArr.length == 0) {
@@ -737,6 +883,9 @@
onPullDownRefresh() {
uni.stopPullDownRefresh()
},
+ onShow() {
+ this.showSelect = false
+ },
//上划加载更多
onReachBottom() {
if (this.count === this.storeList.length) {
@@ -832,7 +981,7 @@
height: auto;
background-color: white;
padding: 20rpx;
- border-radius: 20rpx;
+ // border-radius: 20rpx;
display: flex;
// align-items: center;
@@ -873,6 +1022,11 @@
}
}
+ .selects {
+ transform: rotate(180deg);
+ }
+
+
.search-right.styleType2 .right-text,
.search-right.styleType3 .right-text {
@@ -901,6 +1055,16 @@
}
}
+ .town_name {
+ overflow: hidden;
+ white-space: nowrap;
+ /* 设置文本不换行 */
+ text-overflow: ellipsis;
+ max-width: 25vw;
+ font-size: 14px;
+ /* 设置溢出文本为省略号 */
+ }
+
.hot_serch {
color: #B3B3B3;
display: flex;
@@ -1086,6 +1250,43 @@
margin-left: 10rpx;
}
+ .selected-list {
+ padding: 24rpx 14rpx;
+ border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+ background-color: #fff;
+ position: absolute;
+ left: 100rpx;
+ font-size: 29.79rpx;
+ opacity: 0;
+ transition: 0.5s;
+ height: 0;
+
+
+ .triangle-up {
+ width: 0;
+ height: 0;
+ border-left: 10rpx solid transparent;
+ border-right: 10rpx solid transparent;
+ border-bottom: 10rpx solid white;
+ position: absolute;
+ top: -10rpx;
+ }
+
+ .selected-li {
+ margin-bottom: 35rpx;
+ color: #F84221;
+ display: flex;
+ align-items: center;
+ }
+ }
+
+ .actSel {
+ opacity: 1;
+ height: auto;
+ // transform: translateX(100rpx);
+
+ }
+
.store-wrapper {
margin-top: 235rpx;
border-top: 1px solid #F6F6F6;
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index aab051d..2370a6b 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -421,7 +421,7 @@
//获取商户入驻申请协议
shoplist() {
agreeiness().then(res => {
- console.log(res)
+ // console.log(res)
this.detail = res.data
})
},
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 639bc8d..042c24b 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -36,7 +36,7 @@
+ :url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}&townName=${town}`">
diff --git a/static/images/GXSC/BSL.png b/static/images/GXSC/BSL.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec02426598ced9879f4046c00d6021c05a6570a7
GIT binary patch
literal 1109
zcmeAS@N?(olHy`uVBq!ia0vp^J|N7&1|*M957Y)yjKx9jP7LeL$-HD>VBz<4aSW-5
zdpk4wv{^l)`_kc#d@tYRvcKwH_1zQac`Tn)eHR+kuU5bHZN?1{&2equr8gN
z`c9*x%Sz)yvy!3q#=rBLtix;$UB7Pp{>-eI<;-hKt-h~`Ja77av$>HIi_Q{1Lr$HH
zCYEUjnpm1Xl|(Rc3vryfoXDx;p`hX4uDU^?ae<92$&&FB?Vh(d?r^VRTGv*;j$uEO
zAEW!3H)j)WFH@SYZQ!}OaqfY~2fC(-{bPE=S~m0M$(0vgOeo1apz@Y+-iv@_-%o31
z+TQ$p*Kz$>nHfu7H-tBsHfy!_H=IrTcJzSF!t3c=K9ih3ZG7=5VCvaN`3>x6-!xDB
zv~}4`NdwRA%Ze@d+Gm>5%@G`eyiV0fzqw%)PgkE}XQD;XI>w
z*cW?d=`(Nk>h1iMwT#Q>Qf%s(RR@3ZRvbCQ=iW7ai&%y1jtaR8%h=W&sLFOayoYgGWQm5ziKR+psV*|BhRJgU4AcL{d3Nm+_C$*dQ+TziqMvejiM3zN_MRH
z^zi*Di^th34l2GBdvHT%VK3Jj)@zXoduP@f&A2j&g>_bcb9l(7Z&K>%j|@CtH~!^4
z_e&}wJ#F7UDO;7hPozs8tn&I~-_X8jvUl*r#TGz!@a|afNwIzFwKI0obFb{5TgF@<
z@?q`uPZGSh5)vlWsQxQr*17-uu6b^RcbdQb--_y47uXoJH+*A!9{%su^QF?~zGy6y
zk*xf_XWzlh{#iGrYwzBZj^JM7-@V!IyKc^j>PhQ#?|we!C3k;u-Yf34;s&0x8^opO
zl`L$Px=c}YY;RCr$PUGH_;%tTtVattW;pRf=CUB
zbOAu%3e2k@(kCgo2h6>pmw5<7VrLe+i-nH(q$e(b-TCeOpB*STT%)Fd8ujcClZOL<
zBi{rE01p6;oB|`C{(%Dz01ium>2#VZrT(dungPHIrPOpYBScK;Z>7|#^}h-L?htW_
zi2tdo>d)VXU5VY>N5_HF>GTBve4iu<0XA1ktwFNA5Rm}9ZklEZ0H3O=y0d-O5ciD+
z!0B{4OOoVA4H|*y{6a(mkHGv`RTTjm{S`fcd7l4>h!=f1O^O6@rc&ynD2k8Ldqa+o
z7Qmr^+a`YOKt=~386}g+$fLWIPL}Du@)OK*>MOl{bVwqzU
z0Fq@nnM{6(kn8s0MBMl~28(rY0H@RGG)a<$Qp$;CNxmHb?DOr`KBEinA&a$Xnv<%k
z$gdpi8Wg}h&*zBvp$B;P06-4;lKeO>G4-aIY3HAG?YA}v5Qs{tv!W=jZSHq*&tL#%
zS@uRLMaGKFb%Ti4Wm#U?+`N5{p358nez18SBA&ULi}d}20N4Y(k9A#N__74G1x!X1
z1q?*jP#^{eki^$yGWk_P9Yp-pG|f3zL`t5$YpfQrmrAMcCC{qs`nynb+{`N|fEEVJ
zJw;*4vb>ZK($&~3%g(i1!_tvM7&gHG)ULt;0RGGtbP<}Y$);)Mp?CE5ob;x<7Fe%U
zUDsrt1__D>12D@nvNqpvxC0SCH%&7OMFi8FX!9jWvQ$d_%QTjLN5r4YvOMRE?K>t2
zfaER!06FTMiwqUgcR_YAXF@baOAxYpxt8kd5blL{0QK(um6J^%W2G$1*kYi6!8pq@
z;zXlyLqYJSX~?MYx)Hqtm}MEIf_^gX^w`AazWGYTDI&fr%hGFX*DHY9uliyF4*>4#
zx}N&-?-=hF4bkhO5Sr0Ct?T-g&vkhPFwb++862lLh`tb^WEd>a>mQ4vU>R>V^YaFv
zfcv~I(1s}7d$=3aCl`7HFv~KEWc=Ge3=*BGYeoMsOK1O3WX*%FO8c6f_-3*C#07^l
zPFtq*>`qbYQy2OK@HbPI0TJK2h_c`;eeqv_ADRT_0E%3ejtj4o2ClyWxKYbhZwpaJ
zYua(e=InL=!RVx_)V^
z`$)$r1;2>7Zr`L3?-1ej@p5HV3#xVDZ$pSt=KxXx?qo8dpmo=EQxt_kSM9!i4PK&5
z&o}L#oxfv)C$=Ewc}`jR&M=z}a$9YZeG769AXA)J=>sh`7tT0un<`)R;)#to<>>vs
zYGW6OJ^(bv3T?&b<4IZpGb3Qdf?6jYEmq%2?`Mip=doTN0Cu_$6!R?0l9dx|6Y=ph
zJqJ*o=DL*V`^V$kquZ4@iJWCw)s=Fhgs*FN!a0C>o_88BHn}qL^L|(Gg(*7k0q{yS
zuvEId5CKw5sM6aQSon%5;@xwES5iNb6TB#j!YR$2K8$0)*f{TO?nC^H2=n9RYG+;O
z!z@jef@_W#M!>V<+m)#5jpNk2He`YWXtRLFlaz?wok&Iee6(1xL^Dg5BHkP=Rw7H8
zvw>~a-=!Ly0?4sIrGeeG_)Ju%k45RI=MAP@k*A+&jA1@+@Fn+|L}X6Ios9&F3P7n2
z;Q4*{^U>`}RD<$(nqHc8qK#k3umPMVd4qGH4*+cl&Dj_>&piORB`+RM(+dUNB^gpt
zw>C5xq8S0-9pA1*B@qVzEdV^a{bD6a9#3C&yF3Q~|E_+eQJCLn=^PW)S(0cY>U@Y$
zP8EXdaGKT5-DeeX;(<~#nnP%SIE?DPbaQviuLCMyg8#F=Ss
zD2+gT*1+3+&Np%19|^oi;GEHr2ed~Y3nc&<5&2bFmajORvKhmToNNNofN+5TH=CH~
zItEI~Rs|Q_fVd>Gvze!gIhM1ID!rLGN}BASa+}qX%iS>ynB@iH>Ir0liNe
zoY|CAa10omjcb~}a{#p{>8z8aqgPTrxLL@$4iv1rTXfRHCI`sXe>BcUbqoa{r$Wox
zob~}?AMlvq66un%pGYh
zM%(ViV*=+26y*Y?K;9$ZtQc@{4rJH7ycjVWK6@gwYyxUF0KKeBZGg=bZ|!e2Gu5I#7#Ij&;`CnCT0I?frS4(;=JAjD;`j)4K@W
zykN+~kG8;Y?&GKkZK#d6ONHh_PM?@%Q4}W}!o@O%)8N2I@OpdwUUeY7Ot4d_L7daG
zbH2dluF040*It)*0JSk=OfgaGY_UhQ{%oM
z(WRgO3U;v56Fd@-_Kjs`+=J=9V2=DYK}?lfG+s9kk0wT{dxTQVv$M05kE%1%<_pS!
z62H*4ZpO4=o8R+1r?VNx)4D@g(ZK-}_=Qop6`b=PT533NA;Q^gg8(RK(-@@h^gcpy
zMQ4bZ=e{`(0-zv9O8RgxgNFO5gdyiR7=Ri?`cAF!b8tg^(ncUU=>sLf+=k%6>@GRZ
zbt?d%DvCnf{)(eRc8!sU&JY3Xu5}E`f!d%kX6?0+5KNSE!eyGM)?F8EH&;{~sND*x
z>SCRF2w|o(i9}>0BnwkTSxa;VDT)8T1W;nsY(PZBQ~;jy7^^FwMr*`uPuv1TE)Bgk
zBH&KIX56Sm=w^YE@3=FGGD`4hZKDKG>Rxn#X!|ua=Em?oY_tHn0C6n7-e^N@HtLhHLia6103xM^M&qcPz#X*?+~HzS9GwZWpJ&da80E<+uA<`UnPx+_DMuRRCr$Po$FB?M-YI!&s73`Nshov1cnF0zm{832;XQ
zh6q?iVE6^tRoAXQcID%-v(r7jv$uD>Rag9Ap8ak2yn1>O{289
zbWI2!HqOf9*0hER9AH40(eUQVAfR_SAv(YYfEsvpQ8^(d10*6I(BA^UR`uI4v=Cg>
z1ORw!xd4DuMC^Q=Nr9IeViG_iVpv}Q;Kjk+7$g_Rv%L?9*x5K^0WT*+H9#Wz1OV?l
zfD}{YS42FBNhnEU2`?8!6+j}|2Y^2%!s#IG5h8xHDpv%L=yYav5Py!TzsoUE46qvW
zt^lgVY)lWjOS6lJJVqux5_m*(vN0|XX{UH|k1**Qq6Q$3KffkP%r5fT}S6nCD8$P$1-St>JX0dEl?iU1N3ul4>42>lzc
z1rgC~bC-y|R_n~BYI#}lS@I%S!s{EN6dkHz_0L%fe4~Q!PFef}MM4ZyW+N9+1Ui2(Iz}aE!2%~n5>P5Opf`P=M#XiyX
z8o{RYbbsjq-t87wO(*H|vbTn((L@3|+Bhpk+k;CD@SmMxYdXTvvS%jeuHcCw5|!)Y
za#LafmKxyQUhy6P`P8KG=^CCC;`-T@h>0k1b^bS)b>Qt@@eu)=*N{Y~>*JD7R$H
zEsbmbN&w6aQ3`J~r5(x4b6!PP24F6TIpJ}iRtjL(5Oc#@Nq}8J>;s+#AiL0q)>V9O
zq5UeBXr2YUJ0Dsbz0he|Ib(_6bi5aB2KPQ_X4L
z@U#Hiyu@S%GA%Vyvp2}A<;hD5JJrwTdXsWh+}2iqKcJLLAgXt6_YTcacp+sdl`--+Kb
z-&k42q^s}8^Hs8FSA&>>LunEqW`k!2FjZKKnqL7iD?A4n@#a(z`Sw$ItS7o8f_=@A
zP((8tlc*;#DU}W_?}IlP2Xw&0XC7q?4&igo;6C&6bAZCPX$BKu>j!{q?HQi1%3yK_
zXerGe%5s1`2;H(u2WTnH9?EinJqX>hN(X2u%^u2ffISG^vPyG+RVWg(4Q@m{x9o6R
zSwzHcBaOF*+Va2f|4YlTD^JT$23P_6tqM6Q^6M7}gU=uNcVfLCTE%|jD`@pTZsW}%
zL3^Jj<^5d#9V6mNLOIW}CIKWO2FEA#U39vspS-Qb$4SY-gsS_Fe1AS?`*}m29kEOf
zqSXM2h&!I_&Y*l7x%2GIq=py~KuFoNsBGNs0}E@S0@!osYYC}?zDC?Mj-rs5DETGi
z`o#bv;-w|_OO##g6IzXV9QYttnCMW4)GuLOs0LtL@Hr8I#Ka{cilRCY5r>Hm20ln^
zlQjEg%6O;&$ZxOs9-FjRg7iO1#zG?ENf1xI7UkiwP#mEtMFZR7g|gp@dUElCRNHRX
zisFS5QJZ5jhs-pYAy$3imp!yDPIAx^X<)?Q&x=-5?TpYEkpLpD28cAeO^qW0#3zO5
zv<8^en3seRG2=A_m=eOdq5Yl4SapC;r0xJ0JYsK~33Y%D@R3eO%o~!19XFwFLLW&W
z>22~!Oxv9H`Tt!5T?1VMLwe(5pz(Jjd=@(J4}Um72Pm3pxCwO=8hl}V7V5K5pN0A?
zG#~*#jR+69ZbIFJx(Rg?>Lyg}(e5U6#Y`x>p#L3E7h(!Qx^LOg*@2*Kty(RR6QaML!UY
zCc9yZ0aj*o5!~z5->i?=91u}RNURPQUDv4v$dehK4D>k`CYhcH5A6glQCUU)tW71V
z09IPavnviYnLBbXYaWN3Op07s-BQXKDs!HJS+H6)z`8Y=&CzKE&up4sxxVKLTx%Zh
zG#TI=NY+SRubJMBs7y7-3RQhtAj+6MERVSD{8R6WG}Of}+w6|NiZ?xow3G&{m$=OLKtPMQ&T61GJTA_R<_+c9Gjw
m=m2fynY}azm|f(y75)eME$F;-6HHqG0000V7cPy;uum9
z_x5INwoIxB`-kFrH;=Z7i^b3dXk@G*{I2RFlnjylyv^BEE}
zIhu^m6ia*5EJ>L6{I0vpdZq*29TssVZ7x?_j%;UqV48fUpZVg386_z|`MsJMWtPP-^}SaWYO2(l31~GdgYGfcCKYx%ccgs+?>(0
z`=Z&;`wR&OB_4mz+}C%Rhj&fX+OVlX>4Js%2iNUWSajK?WMW5@*GhN6j|L1jkp|DK
z1ke87mv1#MSDwk4u{bu|x^HsQ+mpAA1^0G#td~x%JNbL}^U8AO1KOz$r1=YQ|3KlRLI>oxbOLGKw3tXo^D^sBprkJYi@VA{Go
zV`kRNQTEepH-FlYr{ej^M}Q^1$ZY*qyM~VWN{`+JF5u#hF%rVXVrU4FGbt#R;ZL$%B;R@x@(t$Yep@*_r^`P3v`}O
z`)ON!u4V4JC1>w%y>_`{$DL=B%M~(eS+x%_HDr5EI>YMtVJ&Z4u9|DG*V6L`Zx+qIq#a=7>855#6Gd%DTaowCK5x1rF!IPNlwJSojmd-y?{%p%Hd8MkZ-w!Y4
z{oQ8*a;Cq)$7yp~*KLVf%iQbsxSEg2JbGn_oW@kI=K_WI6)sk>U5=7>J2JU4!llHr
zYf*Fav0E&s?$ynaSBdgZ(3}?ZN|{09dCXOLfx@yI>ywPOsJiUg?|XS3Z_@+gyk_&y
zvCX21j0eg+C&}m*|Cu>hVCHu6<@~=Y0j`;ZW5}Ah?^Hocwb4_T$_6jE+S_Mzmf!X?xz9
zlfm6gTxpSUN5vJ1&)dKDl{;(*TG=z*Yv~vF89V>aIbFT){r-f_w%Hrjq#p0guveOA
zdTdYP<^z6buVig~d^4Z*^y}BJ)vsNFVdQ&MBb@0LzzDfdBvi
literal 0
HcmV?d00001
diff --git a/static/images/GXSC/SS.png b/static/images/GXSC/SS.png
index 3c02ebbdbc9f7f38195b338dd274acfbd9906a35..96a12d37ae9a57116ee54f71971d2da437eddfc0 100644
GIT binary patch
literal 2792
zcmVP)Px(uRN!+3k)P~%hSncj$8sG@BXMXuqcXsDdl6O
zQ~?0^?}N4c0icjl?r-o|Z2YYeLfitt0s!7OO|u+1w=dn#8Xy7_LOfMU9avZehu{GK
z0WPGJi?(gwju~i{0IRC{NeJ=W{>Q=0)dp(oW!tvbP1D@EF3#!i*#InxVy=|>8KK>o
z3X{qU04|L&XJgUI!2zzpNhyz#l5#%`r&k2|#g@8nNq@y)0MWiFrCw(U?k)ucd7P_8
z4gwHu8~~gTIaT`T3IL#8Jl9&E`P`S{+N1z+x}42szX&0|xc@0$lIt1hy&7X)G);qH
zNfy6k0IRBc4gkOO)jEvhq?8Q+pb$}@>zEGZ`o)7RiefcLX0zG8jS(?+#8~kM2Fah)
zb$!9mPVXj?04&QAZQV(a-d4egFG
z<}y}nX8VWn=8=^0X#mNlZQH|G{iF0J8bB1zY&Lr%gz(Cq0Ki)esfFba#ZA05~#RVm#9SagYo)0l{DNwA#bLF9p$!#Jlz_Khc
zOrWO3uG_XfN|l
zegJTxweAx(k>7^}U{Mr>QtAyQNC$x9)E*{T8jcHnAPON~q;SZ31N3oPhJptN^Zn0C
zyaW(OLdv-SXcUO^?}WIPi=|f}ju|B(1lsw|pY=@9sfik1^afa#CB{y;j^}!zWYfys
zj(j?tH)2~@0B|d%IKOAag%3y%O}wh>`h`n2eg57HpiNG{BXnReoA>eA{74FiZMGoq
z-z>?i4K~bp?Rs~csfo6x*b87)RhVh%Tv-5sKa4R4LwTE@p3TpNAbODhOs&WF7E4k<
zUR4z)9e(VBi1DG;`jHEC=--0@V#dOz%DSHYp>11)M-oWrOLX1$@o;`ArSwW#gMj0`
zo24_AXLG5IYlQ;<&a~E;6kz`a10-tSE3Nf8d#^njBu$}P+LHoKDN`zCAX|s#QH)tA
z2q3Z3Z?)E0EZlxPoZ}Wk@6`q=;PU>>^4K+As;WY5?bPyE9(WKyiuSc_i!StFQ|Dcw
ze|$DSm14CfNy=^hdp}$}xLI}v_F~FMyOZQtZH$
zZRpyDFwOQ!3S2TGI63g@!Oe1~S8cWMPe)wH>X~~1bWNYQzNfYB(oSyqv$Tg0|B_;{
zHQl!P1c2N7ARcw4-CV&vZW-b9&bSf`GHVo8``+oRTN4
z>)K21UGGkAh%!Co7CQJsN1JGr?Dnt$ZXdi^KJ03{sw(LEJExf;10>kL4|QE{eqiY<
zzbvk&u1`m&DIzZgm}Mq^RClTBcvMH_RaVJ>~vr_=k+1st)IPX5f}^{?k$#`>w6S`
zfyzko=h|99
z@Q-yrxz&J6K)JU=*gM3wc1i|F@kF^?l>Y6^e2e}tO*Set9nk1()%J_KtZv7_Id
z780~iaC)D?0Btzo{G^zBu8%$a^=Y5t8*pY{Hv8&r1My~x77lg%VjmEp_fkGNkMVUb
z_BRNi)k4Y{DbbGC2o*N>eT2AA#Qf|o7$9N$_)1n^vqM8YH?6H@{JmN{Q-UzbuI0KmKtuno`oe-+oPCgbV&)S82Ax#460*8(7HJC8A2
zvb2dst&B0J+ng+GM{$-&3NblAtBqJJ3y*Fl9J0zH`(BOMI)_*)&v`cGL~k`0kO&S#nc%Xp
zlwE3@87X57=7zm%EM)=k4#?1w;K6FP>7d|1;!5rL+WU~KO;!Ncg0!`3Q7aKaT3QdiKORb^UN-5P22I%o5HE(6OO@EIUeoy^Y;K4ftejsN3)-
zfQeyJAx;1jgYkKswd*_6iatBJCk^zGJma;F)EoID*$E&cl#r(I_!he|^4QiJKJf|Y
zCx9VR&*+{BU`8-Px-tO_ky=LgOaL>25z>_jV2IQ*x@Q8I5sZ+oOaMcqmeD;Ez>Hvo
ubY%hPy0xJg7oRCr$Poe7Xt<(0?(hi(B8gA3R_1o~anxRyr61*1_AGQkWw$tY?jPF$)q
z3f+jAnn=c(*p^F7QWMdBjgD41l8IJOlZna(~9>efPfm-R14)R#}$5Z#m!ZyZ7JUa=!Bs>hR%f+YSWbSTx~iFdYrxD1Z(EFapFQ
z(*I@}0m7&{Y`!)rY66T;K)e&cPB3Nu4gL_oyC8lCjJMH;x9OhsA4OetrOTsA8xTeP
zJSR24V04-6Jt7Rwwp9Ffq{1!le0Pq~e6VLg~Uv;|wB3=xXw@EKOpgNa?W1g0hgf;%w;+uP0o(?uYB2cXfl1X*oW
z0vQ6l4NSiSryjwW^~ed|p4~PBMDsv&hB0tWs03=30KWjn?G#TgskSCmjX>~BG@&(i37BpG;kar8
zrS>R+G7xwZz#Z6IeLHWH}Y11X93h)sm5!)N}vV^
z>;|WPiJd!tN)K%NwA}WVRUpzk6Wd}}fao@LW-51AYkf6Npa+Z}V{~F+Id?qDCJ=nx
zgchWDQNMFjjrWzBuLLSaU@H=SOC}I$zlN6BJs`TOlnv0b
zl|VxiV7?zc$!kmHH&GIS;F%bTme_AWG^3$APaCfU%0Ym6F?y00(4*KBb#;*o1YdpV
zC=BcS4}hjbZLF531eAaq0bY*XduPynn|0>K?$9tUn-4x+=OGEU1;0!qLq0p_)!-YL|zX`|1aj>#ht2)=&Y
zLD<{03PguSVU(7k1e8D+0{kAD`%a}hH%eH%P)}%q;8|lvqG`Wp0h|)b63wgxlt7dO
zUPj;NQ)$80&%zWMN+2>@nby-FOb%m&=2ZeppacY%pG8mdFT-qs1{R346I4g+A%MPH
zf~IMaNf$`lzY}6{#F|zKR0{!Kj;`cXKkE_x1fs*b1HcW{(pDd>G%{KL2$dZ5`@$0k&CuT2`B-`35}O1o|xoYAh_L{48n4Ss05TiofBY8adX3V
z9YJurwG;%oR97D*paklf0Am@&6OQ-eItm2OX`6@?NrWiRMa+8UrfpLK4MBjJfz+u^
z&Qs0;(Qf?)go_&jjy6&WC;?fESVZx}C3X}A0>N{}eFfa~w%)q!^Q}4m24MVggPA_v
z2K-9=%R)Ryot4S_?(_MD+-_{1QYBHnf+_v$TJ4>ez*zfJTq8XlI#2PffLRJzSsfWXbbnL0uh|6=5#0E
zaFDA|AUdpf0UW6ueG-UDAVe6BJqOr#|3L%Ry$alU;oyI(K=|w&O>RhF4Rs}saveeN
zEb9a`;dR5pG+8czFaj~@B4FbAK-=;8!jN13iw^^fZp{3jVgk|m0&vimz58a(i$M3K
z-swu2LZ=v|q#La4KAcDk5^rQP=Zzq^-I@==b-_w*@LWLzLPiTRE!lsxJG?JG1>Sl#
ze?6m80wF?nNQCPhEr$WeeIvi^tDgdT-iz*K`d}Tf@{#DutM`%^cTqesuy{5g5ZsAo
zY_~Q87*p>IO47a{0#WR*y)1IdUwNm6&PoY{y^SRS8F8W2Fj9)RNhL0>hq@B21tSRc
zoD7LQ3W4a|18i9fytWv4`W|;nz&e_cv6o?K>PHoERO?`q8Xas?f(aE7F2chGfXP;q(
zqaB%A?cE(+9q+#q-XA48YigyW71WhT-R<0cV>kt`%&~WzV*hL7O9{VDoY)`J2
z`-N=JhSh_v#P(f`YF~per(~8=1;UI|B~taTLu5w~Z-DUCO4w0zb=nsQ{Wc(XaZm+9
z&tmv}f6A9Wy$(U?koMbRd-T2wL-M5*2)6~gPqvu5TB|3eVMl7R;sm%CTav?x=UNu}
zU^^bD@LUO$QXt$awIBQ{x1&_pHdo8*RI8_6E5)w~6G#^*ebSe|&`!_3U&=p6Ax=*_
zwic$$-F7qmYp(*~vy)tst3deUC<~R`Ze0UH5w|^mWj1W;D0VTTm||T27%*zUQ+BXB
z>;mS;QA$S;jrv+&Ap)TXw4&(#C
zfYUAnnuq46^|K!0T}vi~3WO;s_jGcp4r_?H@F1lG6$p2ZGNm|o4lrS2ej1rxJokWk
zkXk9n9>CYFRuzaS-s?3Y5L*DWL{VBpml1_Pm@e4aL(0iEsMizaE{2~qh+N;JGG`LN+1e>C?{e+!+QHJhKWGPU;C+7
z=STXM_Q|N>rN;*2YkIX=%DLqB{9rdGWvD=Sku~|fM@A64^q98^D~~j$0+BmRHg%MW
zz`TMY{0M~IIqZdpibuSXkMoT06$aql_;zMGVLDB4TeFbH*du-08>j*i#apvm1tJQJ
zCTkGczo>_u0{pQ5R)Ja(2vbH9)OOkrGTWEAk4&9p)L?ocjLw5B(?0$TZkaH$&2%1JdX4#!^iiIho2K$I1_Xe`uI`=ye
z7%>X4ua{)g$X2My`a{rmXg)iE9$AA(fDltQAqm(8LjG!QOJ=U)vv2Fwn?Oh?x|2)j
zYp0`zkS}Mz?CC{H-R2BP&z8+k#OHbw2$@>^ZHeyFl(mK>cNdOA{A_tf)5DEe${O{g
zjH27+1DQU@`$j7nZa=>;{6#L+HpLKz|MU#d>=M#+=O@7D9~F|eN8!p%AzQbvJ?Xq|
zk=^oqV~GZ&jpF@vD)RyB+z<<`yHCO
zaEb{-m}~5&U6bDh;+Np}sl=6Z#e_lD8Qxg|+<&!uOJrK{cmGl-$SM+kd*3WQW1$E{
zCkQv0@Dh40EP#v}lL
zR5k_#oO~T5gxt%&D|9PvRDqDu!o>4|w&R_rVdBg1=6{-ix6Jw!Co_PvKV}
za!ZpB?ED|)m%sX{;tO`B_B#Eg6(_D6Pcbc_Fr92^+TE$$O0x&=b@P%8ZcSlMY2Uy9
zz4@7sDC@4DvU;d1(VD$kOE2yX+p%E;Lh6=av-WriCZ{I7>~{K?!Nj}pw_P7{w
zanK$)blm^Q?;rnp@V{lt_K2?)x_d{_R#ThnEuHP^y~!XfueUaqwLM`4LX35qY6P8A
zJBdTssYNbO`w{To-M~jVA8l@0`v;x
z!yriBs0BhsVc(i-9-1zQ&Gnxrz5XE0925xks0`QbQ3`}u;xt^A|L+!+Nk$$goLhLb
zyi($jz58PQ>f&c5Oa(#?Xtf*${NGCNDT9c_(|TE4;1{}o{UKi<=2+9gSQ5C++@W)^lcX~DfASaMPmlWTTYJd4Vj~|Dfsi&{bjzUlnfO)swOP{-66jxl$QOuC
zG-F%rBM^;LRsjfkA3P%m{dnKYTxrLk)d)(ZhO$4Hti@S`dUR$gq
zh5)auOO~xTI5Czw(VHg_>2(M_*%=&jsRTkSlE284uXGjyyTvA_B7?WmIj2)tz1)<=
zwi~?!B73KXQ)I5(I*P@Qh`PP?UEaS^S7P9}@W2{Gzd-1AXVA_sr9g;HPFtW(;^5~Z
znxJjX=JOH;lTdM90+DN@tg{?>M)CL?Diq;*HD`KJFoMX4MC?5f*}@WstFs|;mqH-q
z13dL_ygv#%;B25+(X|hbcc|6*Rs>7=bVq3YqG>w+iUKv?8xYO;pOv
zXr@DHej<@;ucHWXyY(9oF0P4&mD9-Vhb(pGx)008Epy}C$4wyQqdVgCj35*X+UnFU
zDO19-ExIxPS6QDpX-4rOx4pbledfu+e#f@G5+?IZtO=%8eJ3Nnhd1Nlf|CjiA360^1zJEI{Zo~!TA
zEJjMZwygEyuWxqT)%*e!B0&6|RBYOb>`aBV6vwl(3z<5#C?;a3
zQ&(c8FM;SEMXUtjv|5+PNbQ%8#cd&R!)ou7gITxX9a{m3b0BK~_BDk_4Ym~~^-Ju8
z)~^7g4gr=w5WOJz5mph@4>y{fu_z^%#w~l`V3vP@=xCb;40)A97uI~sNVf@t#^mw;T16Hmys7p{-DK+GCD9!*2v0+4g*L*p{lmMeieA@C_u
zdnZu$rtP5wqJJ%79tc0J6ENBgC7=X=>!~Zzzxo_v1d$eqnHY-J*y{itqhytU5~z6s
zYjAMl80tjIt0kUOjBEj{0cE^c>hDURHVD{GY=)j<42VRBCD%y*pf)I|l}bPf6cAwC
zMe&4z`)ekr@dzS4)sU!D+pYfr5aL=U?KCBz1S&&-U&X=6N!e&oCN}sIh_pz|o)E(j
zegnV(CKYHJC7=YVg22b1Jzu4}H?Q|&jc9CNDgh->K?14NdDOjr
zv0n=U2}DLDtoa~Z=eI&luLP7pnF;t@cgVFaxIoNA6Ix=w2hof&H&?4u0!qM?0P|w>
zB)?6MqR%u-Bm$8hMRXiK4CwuXE?NdbuX&U}i3u>C12s>VEA)ca6nF%Yt&p!DcM$eA
zJrAN|gBqdvlzPinMWQ_&>{di#Y*?c-zY-tc@W36xwQ(xZv%CbS^MivXNm%EoBfN}wSK$a+K5kSpk}bv>nS
zZ&?JQe_f&pEp4{|G*55rDs{JN`E^Nvx#Uv{JGZh4#Nd=8b~*@g5S>()ov4jc0;M3p
z{2CbT)SdieDT;S1v+M$q9!+#&2)4D&1`W9tz?aI|V696D)EI#sVEhE56J4d)rSM`=
z5rG&OP0X@dF$8jKTyGNh>M8xbu?VCu)TM>!!;fh}VoRkOUr~V=5Q>i2iD29YqH`++
zLhDrmRYYJZ!2jrU+jhBatO|h`6bfq+n17-|QSR43>#Gt1O99;Mc9Cu+Y^*AQ7+lD-
zP6Oc%5GGdwiq@$F%1S`uHZbNJ1}4Br0$2v-rQn@Ug^lo3Zjv=85OzS^ZXGos7UIfH
z7+!9OTAvaaAdnd)tN>vt`gj>FNWN3cbZTB83It=$*fwxe3`{YAVjx&x8sC4>&j=8Y
z05AefBS08c%blmTmx%!56APy0xJg7oRCr$Poe7Xt<(0?(hi(B8gA3R_1o~anxRyr61*1_AGQkWw$tY?jPF$)q
z3f+jAnn=c(*p^F7QWMdBjgD41l8IJOlZna(~9>efPfm-R14)R#}$5Z#m!ZyZ7JUa=!Bs>hR%f+YSWbSTx~iFdYrxD1Z(EFapFQ
z(*I@}0m7&{Y`!)rY66T;K)e&cPB3Nu4gL_oyC8lCjJMH;x9OhsA4OetrOTsA8xTeP
zJSR24V04-6Jt7Rwwp9Ffq{1!le0Pq~e6VLg~Uv;|wB3=xXw@EKOpgNa?W1g0hgf;%w;+uP0o(?uYB2cXfl1X*oW
z0vQ6l4NSiSryjwW^~ed|p4~PBMDsv&hB0tWs03=30KWjn?G#TgskSCmjX>~BG@&(i37BpG;kar8
zrS>R+G7xwZz#Z6IeLHWH}Y11X93h)sm5!)N}vV^
z>;|WPiJd!tN)K%NwA}WVRUpzk6Wd}}fao@LW-51AYkf6Npa+Z}V{~F+Id?qDCJ=nx
zgchWDQNMFjjrWzBuLLSaU@H=SOC}I$zlN6BJs`TOlnv0b
zl|VxiV7?zc$!kmHH&GIS;F%bTme_AWG^3$APaCfU%0Ym6F?y00(4*KBb#;*o1YdpV
zC=BcS4}hjbZLF531eAaq0bY*XduPynn|0>K?$9tUn-4x+=OGEU1;0!qLq0p_)!-YL|zX`|1aj>#ht2)=&Y
zLD<{03PguSVU(7k1e8D+0{kAD`%a}hH%eH%P)}%q;8|lvqG`Wp0h|)b63wgxlt7dO
zUPj;NQ)$80&%zWMN+2>@nby-FOb%m&=2ZeppacY%pG8mdFT-qs1{R346I4g+A%MPH
zf~IMaNf$`lzY}6{#F|zKR0{!Kj;`cXKkE_x1fs*b1HcW{(pDd>G%{KL2$dZ5`@$0k&CuT2`B-`35}O1o|xoYAh_L{48n4Ss05TiofBY8adX3V
z9YJurwG;%oR97D*paklf0Am@&6OQ-eItm2OX`6@?NrWiRMa+8UrfpLK4MBjJfz+u^
z&Qs0;(Qf?)go_&jjy6&WC;?fESVZx}C3X}A0>N{}eFfa~w%)q!^Q}4m24MVggPA_v
z2K-9=%R)Ryot4S_?(_MD+-_{1QYBHnf+_v$TJ4>ez*zfJTq8XlI#2PffLRJzSsfWXbbnL0uh|6=5#0E
zaFDA|AUdpf0UW6ueG-UDAVe6BJqOr#|3L%Ry$alU;oyI(K=|w&O>RhF4Rs}saveeN
zEb9a`;dR5pG+8czFaj~@B4FbAK-=;8!jN13iw^^fZp{3jVgk|m0&vimz58a(i$M3K
z-swu2LZ=v|q#La4KAcDk5^rQP=Zzq^-I@==b-_w*@LWLzLPiTRE!lsxJG?JG1>Sl#
ze?6m80wF?nNQCPhEr$WeeIvi^tDgdT-iz*K`d}Tf@{#DutM`%^cTqesuy{5g5ZsAo
zY_~Q87*p>IO47a{0#WR*y)1IdUwNm6&PoY{y^SRS8F8W2Fj9)RNhL0>hq@B21tSRc
zoD7LQ3W4a|18i9fytWv4`W|;nz&e_cv6o?K>PHoERO?`q8Xas?f(aE7F2chGfXP;q(
zqaB%A?cE(+9q+#q-XA48YigyW71WhT-R<0cV>kt`%&~WzV*hL7O9{VDoY)`J2
z`-N=JhSh_v#P(f`YF~per(~8=1;UI|B~taTLu5w~Z-DUCO4w0zb=nsQ{Wc(XaZm+9
z&tmv}f6A9Wy$(U?koMbRd-T2wL-M5*2)6~gPqvu5TB|3eVMl7R;sm%CTav?x=UNu}
zU^^bD@LUO$QXt$awIBQ{x1&_pHdo8*RI8_6E5)w~6G#^*ebSe|&`!_3U&=p6Ax=*_
zwic$$-F7qmYp(*~vy)tst3deUC<~R`Ze0UH5w|^mWj1W;D0VTTm||T27%*zUQ+BXB
z>;mS;QA$S;jrv+&Ap)TXw4&(#C
zfYUAnnuq46^|K!0T}vi~3WO;s_jGcp4r_?H@F1lG6$p2ZGNm|o4lrS2ej1rxJokWk
zkXk9n9>CYFRuzaS-s?3Y5L*DWL{VBpml1_Pm@e4aL(0iEsMizaE{2~qh+N;JGG`LN+1e>C?{e+!+QHJhKWGPU;C+7
z=STXM_Q|N>rN;*2YkIX=%DLqB{9rdGWvD=Sku~|fM@A64^q98^D~~j$0+BmRHg%MW
zz`TMY{0M~IIqZdpibuSXkMoT06$aql_;zMGVLDB4TeFbH*du-08>j*i#apvm1tJQJ
zCTkGczo>_u0{pQ5R)Ja(2vbH9)OOkrGTWEAk4&9p)L?ocjLw5B(?0$TZkaH$&2%1JdX4#!^iiIho2K$I1_Xe`uI`=ye
z7%>X4ua{)g$X2My`a{rmXg)iE9$AA(fDltQAqm(8LjG!QOJ=U)vv2Fwn?Oh?x|2)j
zYp0`zkS}Mz?CC{H-R2BP&z8+k#OHbw2$@>^ZHeyFl(mK>cNdOA{A_tf)5DEe${O{g
zjH27+1DQU@`$j7nZa=>;{6#L+HpLKz|MU#d>=M#+=O@7D9~F|eN8!p%AzQbvJ?Xq|
zk=^oqV~GZ&jpF@vD)RyB+z<<`yHCO
zaEb{-m}~5&U6bDh;+Np}sl=6Z#e_lD8Qxg|+<&!uOJrK{cmGl-$SM+kd*3WQW1$E{
zCkQv0@Dh40EP#v}lL
zR5k_#oO~T5gxt%&D|9PvRDqDu!o>4|w&R_rVdBg1=6{-ix6Jw!Co_PvKV}
za!ZpB?ED|)m%sX{;tO`B_B#Eg6(_D6Pcbc_Fr92^+TE$$O0x&=b@P%8ZcSlMY2Uy9
zz4@7sDC@4DvU;d1(VD$kOE2yX+p%E;Lh6=av-WriCZ{I7>~{K?!Nj}pw_P7{w
zanK$)blm^Q?;rnp@V{lt_K2?)x_d{_R#ThnEuHP^y~!XfueUaqwLM`4LX35qY6P8A
zJBdTssYNbO`w{To-M~jVA8l@0`v;x
z!yriBs0BhsVc(i-9-1zQ&Gnxrz5XE0925xks0`QbQ3`}u;xt^A|L+!+Nk$$goLhLb
zyi($jz58PQ>f&c5Oa(#?Xtf*${NGCNDT9c_(|TE4;1{}o{UKi<=2+9gSQ5C++@W)^lcX~DfASaMPmlWTTYJd4Vj~|Dfsi&{bjzUlnfO)swOP{-66jxl$QOuC
zG-F%rBM^;LRsjfkA3P%m{dnKYTxrLk)d)(ZhO$4Hti@S`dUR$gq
zh5)auOO~xTI5Czw(VHg_>2(M_*%=&jsRTkSlE284uXGjyyTvA_B7?WmIj2)tz1)<=
zwi~?!B73KXQ)I5(I*P@Qh`PP?UEaS^S7P9}@W2{Gzd-1AXVA_sr9g;HPFtW(;^5~Z
znxJjX=JOH;lTdM90+DN@tg{?>M)CL?Diq;*HD`KJFoMX4MC?5f*}@WstFs|;mqH-q
z13dL_ygv#%;B25+(X|hbcc|6*Rs>7=bVq3YqG>w+iUKv?8xYO;pOv
zXr@DHej<@;ucHWXyY(9oF0P4&mD9-Vhb(pGx)008Epy}C$4wyQqdVgCj35*X+UnFU
zDO19-ExIxPS6QDpX-4rOx4pbledfu+e#f@G5+?IZtO=%8eJ3Nnhd1Nlf|CjiA360^1zJEI{Zo~!TA
zEJjMZwygEyuWxqT)%*e!B0&6|RBYOb>`aBV6vwl(3z<5#C?;a3
zQ&(c8FM;SEMXUtjv|5+PNbQ%8#cd&R!)ou7gITxX9a{m3b0BK~_BDk_4Ym~~^-Ju8
z)~^7g4gr=w5WOJz5mph@4>y{fu_z^%#w~l`V3vP@=xCb;40)A97uI~sNVf@t#^mw;T16Hmys7p{-DK+GCD9!*2v0+4g*L*p{lmMeieA@C_u
zdnZu$rtP5wqJJ%79tc0J6ENBgC7=X=>!~Zzzxo_v1d$eqnHY-J*y{itqhytU5~z6s
zYjAMl80tjIt0kUOjBEj{0cE^c>hDURHVD{GY=)j<42VRBCD%y*pf)I|l}bPf6cAwC
zMe&4z`)ekr@dzS4)sU!D+pYfr5aL=U?KCBz1S&&-U&X=6N!e&oCN}sIh_pz|o)E(j
zegnV(CKYHJC7=YVg22b1Jzu4}H?Q|&jc9CNDgh->K?14NdDOjr
zv0n=U2}DLDtoa~Z=eI&luLP7pnF;t@cgVFaxIoNA6Ix=w2hof&H&?4u0!qM?0P|w>
zB)?6MqR%u-Bm$8hMRXiK4CwuXE?NdbuX&U}i3u>C12s>VEA)ca6nF%Yt&p!DcM$eA
zJrAN|gBqdvlzPinMWQ_&>{di#Y*?c-zY-tc@W36xwQ(xZv%CbS^MivXNm%EoBfN}wSK$a+K5kSpk}bv>nS
zZ&?JQe_f&pEp4{|G*55rDs{JN`E^Nvx#Uv{JGZh4#Nd=8b~*@g5S>()ov4jc0;M3p
z{2CbT)SdieDT;S1v+M$q9!+#&2)4D&1`W9tz?aI|V696D)EI#sVEhE56J4d)rSM`=
z5rG&OP0X@dF$8jKTyGNh>M8xbu?VCu)TM>!!;fh}VoRkOUr~V=5Q>i2iD29YqH`++
zLhDrmRYYJZ!2jrU+jhBatO|h`6bfq+n17-|QSR43>#Gt1O99;Mc9Cu+Y^*AQ7+lD-
zP6Oc%5GGdwiq@$F%1S`uHZbNJ1}4Br0$2v-rQn@Ug^lo3Zjv=85OzS^ZXGos7UIfH
z7+!9OTAvaaAdnd)tN>vt`gj>FNWN3cbZTB83It=$*fwxe3`{YAVjx&x8sC4>&j=8Y
z05AefBS08c%blmTmx%!56AB
zkHn8-31LQq%%n6)Ct4b`FsI3MW|`Yb=LeEwe?reW&%Ni|`@=oY{oyG-ND8xoAz=Uj
z*n}Sd$z~@0zgFwasJ?N?!%PqsIg9{E`%&)z0Qx>042sQ4o+*!{W4?1x4=A-IVzjes
z?YIc;S~e!WecMA+fZdAS0k1XmmuwEQA5q#ba77;9auOcDT12`Plyj_NGTWT77^H)%
z?eTLP;00$g(aJ%an=#do8kdDnn;5IJ*()DcUmEb-L{E!nWIh6l7=l_5IX>3j6XV{H
zZj9<0zY~fm1!8vD!f8YcqSE(^%~Lb7mX;Q{SSWPprDT{`x4a=AB~^+;2Z*I
zE;_RKfWg$MBI*Y(@Dwk|v~*?Y_~4^erw!{QUXV5O8zhkt|(9Af5JT
zHin?mnoK4folbAV_Y_Io9bn3nc%wVuuaA$kgC6#52C<4+V+WwxX&uFGZ)-Cyc6WDE
zJJ)5zel9L9b`A>-?O&q`mh5wRfGm0&Ub!sE&#qaxN1is-iNMp@DJdy=EEY?ReJ9#u
zFc_B31+pRbjru>6VcfB*s3e_=C_CDsnDQ0mUk|rRmcDw=n#fp+uIwrpbl^X&M5&dj
zz0uE{wD0Fz&HAz7oH&)IDCza^aAgvex~jR)$(zQyxrMQmZ*BlTvAt;Jh?6u+QM)DZ
zx{!cBA=eY-@$I^3MDzeNXV>OsKCd%uCq~k!T-yRw1Id94mtg_~gsdt~RPcmfxfsSa3G;xGE
znDzK$RYknbTgNjcQ5#-FA99GI+}6$xS&TJ*%3a;%5+BqRV=Z3^1|!p|wett=@2?E$
z8n`NgsLnWq;Diwq&ZJL?jGG4)ex*H$gs$M(81M&LK$9H5o+Fh?L+@^^AWy>qMc~a^
zs(5=&9rbzQtMFql0re8h(^`8x_zs4jD
zQl90Z)G0Y{n`;DhJ9oP*7w{(U>4eGqaWXsRM*DOUFNLO|OEg1wQz!%GFr-VKfVa(B
z_;EK<`6kM-<}W2Li+M$s6L@v!^9H01ni~qXfpegKWWhiEme2B1;n~BK7C**ODoRH@
zfuvj70OS#>|A5~}e|t%Z_qI{t*~?rVg@$EX?p=ul@1#mbr|z{*E|8n%{9P)BUck*K
zP~vjYJ=gy^EhJC2uu}^!33z?RA=b}zahn2b$ZLv6bTv?r<{;G%C-Zp4?o1!znfUt
zesR+d;YCubucjj30=M>o^z0zBip861a9>nacmOirsmsRvHFW$3fu&PwoPcMe`>YD+L`3C~wAtX>rpmF~LDMx2a
literal 0
HcmV?d00001
diff --git a/static/images/GXSC/XZ.png b/static/images/GXSC/XZ.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c16781bf16d335706add508cd1c1520cd99e953
GIT binary patch
literal 942
zcmV;f15x~mP)Px&Xh}ptRA@u(S;1A?KoFhL0o$ig!lr^a9jx6zpaP%*Oa&no1S-H(05o7L6#x}v
z(}6kJ_^>~3vFuo~q#el$ws`Uldo(+LX6OGI!SumD{K4^21F-HDZYtPRaL+T)T+ux*
zkT<-hg5DJE&;VK;&I39JNE6c}uylVAn%nh|YFj}E?v-gw%-uL33|k{}w*0P^0JFd?
zLBXQe2~Ft!t|h?NzPbVNX;ycD@S`&_m$d{q>#G3~|IBOs+5&vl>Iebf`FIT$pF5#3
zwW{D;tFB#;%3(f0T(?JNP%D!0k;;l(fM1=l(Y2F_Szp}|@lk%?(Vwbmro?9TDBo%KD&b2zR0UZ(OkeR{*OV>Upz8)#^yKfAOe7(S;
zyA<<0|FH_DItL~JsF%i2MFN-DN=apXnD+Ty0n8nP-T~xPE6o9qeE}2UqCGNKe!GRm
z3gEP_E}8hdXNW!PjLcB#TxvJfN->k`yWBAhz-?!2GPj6a7L@>W4nU|Bq;w1;;JH0E
zvE^2hz*Pm`bSL0P$wNfAYLCo?%r@UjN-8Z2Rfg8B%m(q0v@~H*t6#*$7!-(R$oup!3ph6cF;eql#XG(
z-A;CH+{$}JlTN2SHDu-!(P4mlbvN;@K5vRsd<>JsP#BNU5sL
QO8@`>07*qoM6N<$f)vcF*Z=?k
literal 0
HcmV?d00001
diff --git a/static/images/LHYC/DWB.png b/static/images/LHYC/DWB.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7fa10fc02852c9759a6dbdd3b7d1efc8dfcf212
GIT binary patch
literal 2824
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