diff --git a/components/home/index.vue b/components/home/index.vue
index e6346c2..854fd38 100644
--- a/components/home/index.vue
+++ b/components/home/index.vue
@@ -1,116 +1,118 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ .pictrueBox {
+ width: 130rpx;
+ height: 120rpx;
+ }
+
+ /*返回主页按钮*/
+ .home {
+ position: fixed;
+ color: white;
+ text-align: center;
+ z-index: 9999;
+ right: 15rpx;
+ display: flex;
+ }
+
+ .home .homeCon {
+ border-radius: 50rpx;
+ opacity: 0;
+ height: 0;
+ color: #e93323;
+ width: 0;
+ }
+
+ .home .homeCon.on {
+ opacity: 1;
+ animation: bounceInRight 0.5s cubic-bezier(0.215, 0.610, 0.355, 1.000);
+ width: 300rpx;
+ height: 86rpx;
+ margin-bottom: 20rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: var(--view-theme);
+ }
+
+ .home .homeCon .iconfont {
+ font-size: 48rpx;
+ color: #fff;
+ display: inline-block;
+ margin: 0 auto;
+ }
+
+ .home .pictrue {
+ width: 86rpx;
+ height: 86rpx;
+ border-radius: 50%;
+ margin: 0 auto;
+ background-color: var(--view-theme);
+ box-shadow: 0 5rpx 12rpx rgba(0, 0, 0, 0.5);
+ }
+
+ .home .pictrue .image {
+ width: 100%;
+ height: 100%;
+ }
+
+ .pictruea {
+ width: 100%;
+ height: 100%;
+ display: block;
+ object-fit: cover;
+ vertical-align: middle;
+ }
+
\ No newline at end of file
diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue
index 8ad5207..3b35aa7 100644
--- a/components/zbpSwiper.vue
+++ b/components/zbpSwiper.vue
@@ -27,14 +27,14 @@
:autoplay="swiper.autoplay" :interval="swiper.interval" :duration="swiper.duration"
indicator-active-color="#fff">
-
+
-
@@ -58,6 +58,7 @@
},
data() {
return {
+ defaInd: [0, 0],
street: '',
showPicker: false,
styleConfig: [],
@@ -92,6 +93,12 @@
this.street = JSON.parse(this.location).address_component.street
},
methods: {
+ swiperClick(item) {
+ const url = item.info[1].value
+ uni.navigateTo({
+ url: url
+ })
+ },
selectLocation() {
this.isSelectPlace ? this.showPicker = true : ''
},
@@ -109,9 +116,7 @@
picker = this.$refs.uPicker
} = e;
if (columnIndex === 0) {
- getStreet({
- area_code: value[0]['code']
- }).then(res => {
+ getStreet({ area_code: value[0]['code'] }).then(res => {
picker.setColumnValues(1, res.data);
});
}
diff --git a/pages.json b/pages.json
index dc25e0a..00f8750 100644
--- a/pages.json
+++ b/pages.json
@@ -95,8 +95,7 @@
}
],
- "subPackages": [
- {
+ "subPackages": [{
"root": "pages/goods_cate",
"name": "goods_cate",
"pages": [{
@@ -215,6 +214,13 @@
"enablePullDownRefresh": false
}
+ }, {
+ "path": "cloud_entrepot/index",
+ "style": {
+ "navigationBarTitleText": "里海云仓",
+ "enablePullDownRefresh": false
+ }
+
}
]
},
@@ -788,7 +794,8 @@
"pages": [{
"path": "list/index",
"style": {
- "navigationBarTitleText": "商品管理"
+ "navigationBarTitleText": "商品管理",
+ "enablePullDownRefresh": true
}
},
{
diff --git a/pages/admin/stockOut/index.vue b/pages/admin/stockOut/index.vue
index 34672fa..8c4a8ef 100644
--- a/pages/admin/stockOut/index.vue
+++ b/pages/admin/stockOut/index.vue
@@ -327,10 +327,14 @@
})
},
async addCartGoods(code) {
- const res = await addCartApi({ bar_code: code }).catch(err => Toast(err))
- this.getCartList();
- this.getCartNum();
- Toast('添加成功')
+ try {
+ const res = await addCartApi({ bar_code: code })
+ this.getCartList();
+ this.getCartNum();
+ Toast('添加成功')
+ } catch (e) {
+ Toast(e)
+ }
},
pay() {
let selectValue = []
diff --git a/pages/index/style/main.scss b/pages/index/style/main.scss
index 98c954a..1f841b5 100644
--- a/pages/index/style/main.scss
+++ b/pages/index/style/main.scss
@@ -288,7 +288,7 @@
.price-box {
display: flex;
align-items: center;
- justify-content: start;
+ justify-content: flex-start;
margin-top: 4rpx;
&.presell-price {
display: block;
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
new file mode 100644
index 0000000..ddd84c4
--- /dev/null
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -0,0 +1,178 @@
+
+
+
+ 通滩镇里海云仓
+
+
+
+ {{item.title}}
+ {{item.text}}
+ 查看
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 14c986d..1e36a1f 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -71,9 +71,9 @@
-
+
+ hover-class="none" class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn'>
¥{{itemn.price}}
-
+
@@ -112,7 +112,7 @@
+ class="pro-item" v-for="(itemn,indexn) in item.recommend" :key='indexn'>
-
+
@@ -883,11 +882,13 @@
}
.pro-box {
+ white-space: nowrap;
display: flex;
align-items: center;
padding: 20rpx 20rpx 30rpx;
.pro-item {
+ display: inline-block;
width: 218rpx;
margin-right: 14rpx;
@@ -920,6 +921,7 @@
padding: 20rpx;
.pro-item {
+ display: inline-block;
background-color: #fff;
border-radius: 16rpx;
text-align: center;
@@ -1028,11 +1030,13 @@
}
.pro-box {
+ white-space: nowrap;
display: flex;
align-items: center;
margin-top: 20rpx;
.pro-item {
+ display: inline-block;
width: 170rpx;
margin-right: 20rpx;
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 81df840..6cbe43f 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -2,91 +2,94 @@
-
-
-
-
- 多规格
-
-
-
- 礼包
- {{item.store_name}}
-
-
-
- 库存: {{item.stock}}
- 销量: {{item.sales}}
-
-
- ¥{{item.price}}
- ¥{{item.ot_price}}
-
-
-
+
+
+
+
+ 多规格
+
+
+
+ 礼包
+ {{item.store_name}}
+
+
+
+ 库存: {{item.stock}}
+ 销量: {{item.sales}}
+
+
+ ¥{{item.price}}
+ ¥{{item.ot_price}}
+
+
+
- 下架
- 上架
- 编辑
- 预览
- 删除
- {{item.is_good ? '取消推荐' : '店铺推荐'}}
+ 下架
+
+ 上架
+
+ 编辑
+ 预览
+ 删除
+
+ {{item.is_good ? '取消推荐' : '店铺推荐'}}
+
@@ -98,401 +101,459 @@
+
\ No newline at end of file
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index b37cf30..51afd6f 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -1138,8 +1138,8 @@
.icon-xiangzuo {
margin-left: 10px;
- width: 16px;
- height: 16px;
+ width: 20px;
+ height: 20px;
color: #ffffff;
}
}
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index f0e937b..f9a63f8 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -164,10 +164,12 @@
if (this.mer_id == 0) {
return Toast('当前区域没有云仓库')
}
- console.log(this.mer_id)
uni.navigateTo({
- url: '/pages/store/home/index?id=' + this.mer_id + '&LihaiYun=Lihai'
+ url: '/pages/nongKe/cloud_entrepot/index'
})
+ // uni.navigateTo({
+ // url: '/pages/store/home/index?id=' + this.mer_id + '&LihaiYun=Lihai'
+ // })
},
async getArticle() {
let list = []
@@ -220,12 +222,10 @@
.l_yun {
width: 456.14rpx;
border-radius: 16rpx;
- background-image: url("@/static/images/zonghe.png");
background-repeat: no-repeat;
background-size: cover;
overflow: hidden;
position: relative;
-
display: flex;
flex-direction: column;
align-items: center;
@@ -278,7 +278,7 @@
font-size: 35.09rpx;
padding-top: 28.07rpx;
text-align: center;
- background: url("@/static/images/lihaiyun.png") no-repeat;
+ background-repeat: no-repeat;
background-size: cover;
box-sizing: border-box;
border-radius: 16rpx;
diff --git a/pages/users/embody/embody.vue b/pages/users/embody/embody.vue
index e93b7d8..3aa4e9c 100644
--- a/pages/users/embody/embody.vue
+++ b/pages/users/embody/embody.vue
@@ -262,9 +262,14 @@
},
methods: {
async getApply() {
- const res = await getAdminApplyAPI(this.merId)
- this.mode.real_name = res.data.financial_bank_name
- this.mode.bank_code = res.data.financial_bank_code
+ try {
+ const res = await getAdminApplyAPI(this.merId)
+ this.mode.real_name = res.data.financial_bank_name
+ this.mode.bank_code = res.data.financial_bank_code
+ } catch (err) {
+ //TODO handle the exception
+ Toast(err)
+ }
},
loadType() {
this.pay_type = []
diff --git a/static/images/lihaiyun.png b/static/images/lihaiyun.png
deleted file mode 100644
index 8827d4e..0000000
Binary files a/static/images/lihaiyun.png and /dev/null differ
diff --git a/static/images/zonghe.png b/static/images/zonghe.png
deleted file mode 100644
index 035875e..0000000
Binary files a/static/images/zonghe.png and /dev/null differ