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

Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into old

Browse Source
This commit is contained in:
wpf 2023-11-05 20:26:07 +08:00
commit f7313b878e
6 changed files with 1313 additions and 1263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/requesta.js
View File

@ -6,6 +6,9 @@ export function getCityCloundShop(data) {
export function cloudWarehouse(data) {
return request.get("store/product/cloudWarehouse", data);
}
export function townCloud(data) {
return request.get("store/product/town_cloud", data);
}
/**
* 供销市场标签
* @returns {*}

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "惠农生活",
"appid" : "__UNI__3A527D1",
"description" : "",
"versionName" : "1.5.4",
"versionCode" : 154,
"versionName" : "1.5.5",
"versionCode" : 155,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {

2550
pages/index/index.vue
View File

File diff suppressed because it is too large Load Diff

4
pages/nongKe/cloud_entrepot/index.vue
View File

@ -136,6 +136,8 @@
item.rate
}}</text>
<text>{{ item.reply_count }}评论</text>
<text v-if="item.merchant.distance" style="margin-left: 10rpx;">{{item.merchant.distance}}</text>
</view>
<view class="good_price">
<view class="good_price_l">
@ -148,7 +150,7 @@
item.price
}}</text>
</view>
<view class="old_price"> ￥30.00 </view>
<!-- <view class="old_price"> ￥30.00 </view> -->
</view>
<view class="good_price_r">
<view :class="{ x_tra: trnList[index]?trnList[index].bottom:0 }" :style="`transform:translateY(${

13
pages/nongKe/cloud_entrepot/indexa.vue
View File

@ -200,15 +200,16 @@
<view class="good_score">
<text style="margin-right: 10rpx;color: #F84221;">{{item.rate}}</text>
<text>{{item.reply_count}}评论</text>
<text v-if="item.merchant.distance">{{item.merchant.distance}}</text>
</view>
<view class="good_price">
<view class="good_price_l">
<view class="" style="color: #F84221;font-size: 22.78rpx;font-weight: bold;">
￥<text style="font-size: 30rpx;">{{item.price}}</text>
</view>
<view class="old_price">
<!-- <view class="old_price">
￥30.00
</view>
</view> -->
</view>
<view class="good_price_r">
<view :class="{x_tra:trnList[index]?trnList[index].bottom:0 }"
@ -401,7 +402,7 @@
<script>
import {
cloudWarehouse,
townCloud,
getCityCloundShop
} from '@/api/requesta.js'
import {
@ -549,7 +550,7 @@
this.status = "loading"
this.page_num += 1
// this.flag = true
cloudWarehouse({
townCloud({
street_code: this.street_code,
category_id: this.cloudList[this.current]?.category_id || "",
order: this.type,
@ -831,7 +832,7 @@
this.showLoading = true
this.status = "loading"
this.page_num = 1;
cloudWarehouse({
townCloud({
street_code: this.street_code,
category_id: this.cloudList[this.current]?.category_id || "",
order: this.type,
@ -933,7 +934,7 @@
street_code: this.street_code
})
this.cloudList = data
cloudWarehouse({
townCloud({
street_code: this.street_code,
category_id: this.cloudList[this.current].category_id,
location: this.location

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

@ -121,6 +121,8 @@
src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
<text style="margin-left: 20rpx;color: #FF6D20; ">5.0</text>
<text>月销{{item.sales}}</text>
<text v-if="item.distance">距离{{item.distance}}</text>
</view>
<view class="li" style="align-items: center;">
<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"