From 7346d21317731900f580c29c57dbe95f37917a14 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 13 Sep 2023 19:11:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 2 +-
api/requesta.js | 15 +
components/Authorize.vue | 674 ++++++++++----------
components/mentioned.vue | 262 ++++----
components/plantConSwiper/index.vue | 17 +-
components/zbpSwiper.vue | 8 +-
components/zbpSwiperb.vue | 353 ++++++++++
pages/index/index.vue | 4 +-
pages/nongKe/cloud_entrepot/index.vue | 162 ++++-
pages/nongKe/supply_chain/supplier.vue | 6 +-
pages/nongKe/supply_chain/supplierA.vue | 5 +-
pages/plantGrass/plant_detail/index.vue | 86 ++-
pages/store/settled/index.vue | 21 +-
pages/trading_hall/transfer_goods/index.vue | 4 +-
store/modules/app.js | 2 +-
utils/requesta.js | 76 +++
16 files changed, 1193 insertions(+), 504 deletions(-)
create mode 100644 api/requesta.js
create mode 100644 components/zbpSwiperb.vue
create mode 100644 utils/requesta.js
diff --git a/App.vue b/App.vue
index 387107c..3fe566e 100644
--- a/App.vue
+++ b/App.vue
@@ -254,7 +254,7 @@
uni.onNetworkStatusChange(function(res) {
if (res.isConnected) {
-
+
uni.reLaunch({
url: '/pages/index/index'
})
diff --git a/api/requesta.js b/api/requesta.js
new file mode 100644
index 0000000..12b6162
--- /dev/null
+++ b/api/requesta.js
@@ -0,0 +1,15 @@
+import request from "@/utils/requesta.js";
+
+export function getCityCloundShop(data) {
+ return request.get("city/get_cloud_shop", data);
+}
+export function cloudWarehouse(data) {
+ return request.get("store/product/cloudWarehouse", data);
+}
+/**
+ * 供销市场标签
+ * @returns {*}
+ */
+export function supMenuApi(data) {
+ return request.get('intention/v2/cate', data);
+}
\ No newline at end of file
diff --git a/components/Authorize.vue b/components/Authorize.vue
index b69365f..cfb0ef7 100644
--- a/components/Authorize.vue
+++ b/components/Authorize.vue
@@ -1,351 +1,365 @@
-
-
-
-
-
-
-
+
+ 授权提醒
+ {{title}}
+
+
+ 用户登录
+
+
+ {{title}}
+
+
+ 请授权头像等信息，以便为您提供更好的服务！
+ {{info}}
+
+
+ 请登录，将为您提供更好的服务！
+
+
+ {{info}}
+
+
+ 随便逛逛
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+ 社会信用代码
+
+
+
+
+
+