diff --git a/config/app.js b/config/app.js
index 5b88400..e806925 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,7 +9,7 @@ let httpApiThree
// 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' // 测试
if (process.env.NODE_ENV === "development") {
- httpApi = 'https://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"
@@ -24,8 +24,8 @@ if (process.env.NODE_ENV === "development") {
// 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/pages.json b/pages.json
index 36b9f80..b378c7f 100644
--- a/pages.json
+++ b/pages.json
@@ -1223,7 +1223,9 @@
"pages": [{
"path": "plant_detail/index",
"style": {
- "navigationBarTitleText": "内容详情"
+ "navigationBarTitleText": "内容详情",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
}
},
{
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 29a0edf..e01fdf4 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -4,7 +4,7 @@
-
@@ -261,7 +261,7 @@
page: 1,
limit: 10,
status: 1,
- store_name: '',
+ search_info: '',
product_type: ''
},
list: [],
@@ -284,9 +284,7 @@
that.init();
}
},
- types: function() {
- this.getIndex();
- }
+
},
onLoad(option) {
this.where.product_type = uni.getStorageSync("PRODUCT_TYPE") ?? ""
@@ -324,12 +322,13 @@
},
handleSearch() {
this.loaded = false;
- this.where.page = 3;
- this.list = [];
+ this.where.page = 1;
+ this.list = [];
this.getIndex();
},
// 获取数据
getIndex() {
+
let that = this;
if (that.loading || that.loaded) return;
that.loading = true;
@@ -355,7 +354,7 @@
that.loaded = res.data.list.length < that.where.limit;
that.list.push.apply(that.list, res.data.list);
that.where.page = that.where.page + 1;
- console.log(that.list)
+ // console.log(that.list)
// console.log(that.list);
},
@@ -381,10 +380,12 @@
if (val != 'verify') {
if (this.where.status != val) {
this.where.status = val;
+ this.where.search_info=''
delete this.where.is_verify;
this.init();
}
} else {
+ this.where.search_info=''
this.where.is_verify = 1;
delete this.where.status;
this.init();
diff --git a/pages/plantGrass/plant_detail/index.vue b/pages/plantGrass/plant_detail/index.vue
index 8059095..3eecdea 100644
--- a/pages/plantGrass/plant_detail/index.vue
+++ b/pages/plantGrass/plant_detail/index.vue
@@ -1,11 +1,10 @@
-
-
-
-
+
+
+
+
@@ -24,22 +23,28 @@
+
+
+
+
-
+
{{followDetail.author.nickname}}
-
+
管理
@@ -59,23 +64,32 @@
关注
已关注
+
+
-
+
+
+
+
-
查看TA提到的宝贝({{followDetail.relevance.length}})
@@ -86,21 +100,20 @@
-
-
-
-
-
+
+
+
-
-
+
+
-
+
{{goods.spu.store_name.slice(0,12)}}...
¥{{goods.spu.price}}
- 购买
+
- -->
+
{{followDetail.content}}
@@ -188,7 +201,8 @@
暂无评论，快去抢沙发吧~
-
+
+
+
@@ -205,15 +220,42 @@
:class="followDetail.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'">
{{followDetail.count_start}}
-
+
{{replyData.all}}
+
+
+
+
+
+
+
+
+ 商品 (2)
+
+
+
+
+
+
+ {{followDetail.count_start}}
+
+
+
+ {{replyData.all}}
+
+
+
+
+
+
@@ -230,6 +272,17 @@
+
+
+
+
+
+
+
+
@@ -309,7 +362,8 @@
currSpid: '',
focus: false,
actionSheetHidden: true,
- type: 0
+ type: 0,
+ isshow: false
}
},
created() {},
@@ -337,6 +391,17 @@
},
mounted: function() {},
methods: {
+
+ shopdetail(item) {
+ // console.log(item)
+ uni.navigateTo({
+ url: '/pages/goods_details/index?id=' + item.spu.product_id
+ })
+ },
+ FToggle() {
+ this.$refs.bindmobile1.open()
+
+ },
// 后退
returns() {
uni.navigateBack()
@@ -449,6 +514,7 @@
that.followDetail.relevance = that.followDetail.relevance.filter(item => {
return item.spu
})
+
uni.hideLoading()
// #ifdef MP
that.plantShare();
@@ -665,10 +731,16 @@
}
.head-menu {
- height: 50rpx;
- padding-left: 20rpx;
- line-height: 50rpx;
- font-weight: bold;
+ width: 51rpx;
+ height: 51rpx;
+ margin-right: 20rpx;
+
+ margin-top: 20rpx;
+
+ image {
+ width: 100%;
+ height: 100%;
+ }
}
.tab-cont {
@@ -725,20 +797,128 @@
}
}
+ .product {
+ flex-direction: row;
+ margin-top: 27rpx;
+
+ .scroll-view {
+ flex-direction: row;
+ }
+
+ .product-item {
+ display: inline-block;
+ width: 444rpx;
+ height: 136rpx;
+ // background: rgba(0, 0, 0, .55);
+ background-color: #F4F4F4;
+ border-radius: 12rpx;
+ padding: 16rpx 15rpx;
+ margin-right: 30rpx;
+ }
+
+ .swiper {
+ width: 500rpx !important;
+ height: 136rpx !important;
+
+ .swiper-count {
+ width: 444rpx !important;
+ height: 136rpx !important;
+ background: rgba(0, 0, 0, .55);
+ border-radius: 12rpx;
+ padding: 16rpx 15rpx;
+ }
+
+ .swiper-item {
+ flex-direction: row;
+ }
+ }
+
+ .item-count {
+ flex-direction: row;
+ justify-content: space-between;
+
+ .picture {
+ width: 104rpx;
+ height: 104rpx;
+ border-radius: 10rpx;
+
+ .image {
+ width: 104rpx;
+ height: 104rpx;
+ border-radius: 10rpx;
+ }
+ }
+
+ .product-text {
+ width: 286rpx;
+ justify-content: space-between;
+
+ .name {
+ font-size: 24rpx;
+ width: 286rpx;
+ // color: #fff;
+ color: #000;
+ }
+
+ .product-price {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+
+ .price {
+ display: flex;
+ flex-direction: row;
+
+ .sm,
+ .money {
+ // color: #ffffff;
+ color: #000;
+ font-size: 24rpx;
+ }
+ }
+
+ .buy-btn {
+ padding: 6rpx 20rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #fff;
+ border-radius: 26rpx;
+ background: #E93323;
+ font-size: 20rpx;
+ }
+ }
+ }
+ }
+ }
+
+
.follow_count {
padding: 20rpx;
border-bottom: 1px solid #F5F5F5;
.title {
display: flex;
- align-items: center;
- justify-content: space-between;
+
+
}
.author {
display: flex;
+
align-items: center;
+ .fenxa {
+ width: 51rpx;
+ height: 51rpx;
+
+ image {
+ width: 100%;
+ height: 100%;
+ }
+ }
+
.picture,
uni-image {
width: 78rpx;
@@ -958,6 +1138,7 @@
position: relative;
padding-bottom: 120rpx;
+
.commen_count {
font-size: 26rpx;
color: #282828;
@@ -1099,11 +1280,28 @@
font-size: 32rpx;
}
}
+.input_count1{
+
+ height: 70rpx;
+ 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;
@@ -1111,6 +1309,7 @@
z-index: 10;
border-top: 1px solid #F5F5F5;
justify-content: space-between;
+ padding-bottom: var(--status-bar-height);
.input_count {
width: 530rpx;
@@ -1146,6 +1345,37 @@
}
}
+ .shopp {
+ width: 209rpx;
+ height: 70rpx;
+ line-height: 70rpx;
+ background: linear-gradient(90deg, #F84221 0%, #FF6D20 100%);
+ border-radius: 33px 33px 33px 33px;
+ opacity: 1;
+ display: flex;
+
+ .shopp-img {
+ width: 46rpx;
+ height: 46rpx;
+ margin-top: 12rpx;
+ margin-left: 25rpx;
+ margin-right: 11rpx;
+
+ image {
+ width: 100%;
+ height: 100%;
+ }
+ }
+
+ .shopp-txt {
+ font-size: 26rpx;
+ font-family: PingFang SC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #FFFFFF;
+ }
+
+ }
+
.send {
font-size: 26rpx;
color: #ffffff;
diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue
index c22cf0e..3f099a6 100644
--- a/pages/product/addGoods/index.vue
+++ b/pages/product/addGoods/index.vue
@@ -162,7 +162,7 @@
@@ -407,7 +407,7 @@
this.bar_code_dis = true
}
this.initData();
- this.getDeliveryType();
+ // this.getDeliveryType();
if (this.product_id) {
this.initDataEditData();
}
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index 40cfd21..0541129 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -284,7 +284,7 @@
merchantInfoAPI({
id
}).then(res => {
- console.log(res);
+ this.mer_name= res.data.mer_name
this.images[0].img = res.data.mer_banner
this.images[1].img = res.data.mer_avatar
this.images[2].img = res.data.mini_banner
@@ -305,7 +305,7 @@
this.mer_take_time = res.data.mer_take_time
this.intro = res.data.mer_info
this.cruxText = res.data.mer_keyword
- this.mer_name= res.data.mer_name
+
this.servicePhone = res.data.service_phone
this.mer_address = res.data.mer_address
this.merState = res.data.mer_state === 1 ? true : false
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 765c3cb..f6cb920 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -73,9 +73,9 @@
-
-
-
+
+
+
多规格
@@ -95,34 +95,36 @@
￥{{item.ot_price}}
-
-
-
-
-
-
- ...
-
-
-
+
@@ -309,15 +311,10 @@
},
yinc() {
- console.log('1111111')
this.$set(this, 'num', -1);
},
menuAction(action, rowId, item, index) {
- // console.log(action, rowId, item,'1111111')
-
-
-
-
+
if (action.value == 2) {
uni.navigateTo({
url: `/pages/admin/goods_details/index?product_id=${item.product_id}&product_type=0`
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index cff11cd..f9b28e3 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -1767,7 +1767,7 @@
margin-top: 27rpx;
.product-item {
- display: inline-block;
+ display: inline-block;
width: 444rpx;
height: 136rpx;
background: rgba(0, 0, 0, .55);