wangmingchuan
/
yanzong_qianduan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan into main

Browse Source
version/0412
syt 12 months ago
parent c270921c25 9158a95b89
commit fba2231024
7 changed files with 45 additions and 29 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      pages/cart/index.vue
  2. 25
      pages/index/index.vue
  3. 6
      pages/invite/index.vue
  4. 5
      pages/news/rules/rulesList.vue
  5. 2
      pages/news1/help.vue
  6. 7
      pages/user/index.vue
  7. 27
      pages/user/vip/goods.vue

2
pages/cart/index.vue
Unescape View File

@ -79,7 +79,7 @@
</view>
<view class="price">
<text style="font-size: 20rpx;">￥</text>
<text style="font-weight: bold;font-size: 36rpx;">{{item.goods_price_max}}</text>
<text style="font-weight: bold;font-size: 36rpx;">{{item.goods_price_min}}</text>
<text style="font-size: 20rpx;margin-left:10rpx;">到手价</text>
<text style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
</view>

25
pages/index/index.vue
Unescape View File

@ -245,7 +245,7 @@
</view>
<view class="price">
<text style="font-size: 20rpx;">￥</text>
<text style="font-weight: bold;font-size: 36rpx;">{{item.goods_price_max}}</text>
<text style="font-weight: bold;font-size: 36rpx;">{{item.goods_price_min}}</text>
<text style="font-size: 20rpx;margin-left:10rpx;">到手价</text>
<text
style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
@ -266,7 +266,7 @@
<view class="topcontent">
<view class="shopTitle">
<text class="title">{{cityInfo.shop_name}}</text>
<text class="shopStatus">{{cityInfo.is_open==1?'营业中':'休息中'}}</text>
<text class="shopStatus">营业中</text>
</view>
<view class="rate">
<u-rate :count="5" inactive-color="#818181" active-color="#FA8C3D" v-model="cityInfo.star">
@ -323,7 +323,7 @@
<view class="diannei">
<view class="dianneiTitle">
<text>店内现货</text>
<view class="lookMore" @click="goJump('/pages/user/vip/goods')">
<view class="lookMore" @click="goJump('/pages/user/vip/goods?type=1')">
查看更多
<u-icon name="arrow-right" color="#909090"></u-icon>
</view>
@ -466,7 +466,7 @@
return {
isLogin: false,
isTop: false,
logoImage:'',
logoImage: '',
// background: {
// backgroundColor: 'transparent',
// },
@ -726,13 +726,17 @@
})
},
getTypeList() {
GoodsApi.typeList().then(res => {
GoodsApi.typeList({
is_in_store: this.current==0?0:1
}).then(res => {
if (res.status == 200) {
this.tabList = res.data.list;
this.catagoryList = res.data.list[0].children
if(this.current==0){
this.getRankingList(this.tabList[0].category_id)
this.getNewGoods(this.tabList[0].category_id)
this.getBigList(this.tabList[0].category_id)
}
this.getBigList(this.current==0?(this.tabList[0].category_id):(this.tabList[this.tabCurrent].category_id))
}
})
},
@ -838,7 +842,7 @@
categoryId: val,
is_brand: 0,
is_new: 1,
order: 1
order: 1,
}
GoodsApi.brandList(param).then(res => {
let arr = res.data.data
@ -867,7 +871,8 @@
categoryId: val,
is_brand: 1,
is_new: 0,
order: 1
order: 1,
is_in_store: this.current==0?0:1
}
GoodsApi.brandList(param).then(res => {
let arr = res.data.data;
@ -930,6 +935,8 @@
},
changeHome(val) {
this.current = val;
this.getTypeList()
// this.getBigList(this.tabList[this.tabCurrent].category_id)
},
getCityInfo() {
const that = this
@ -944,7 +951,7 @@
async getStore() {
newFunApi.storeData().then(res => {
if (res.status == 200) {
this.logoImage=res.data.storeInfo.logoImage.preview_url
this.logoImage = res.data.storeInfo.logoImage.preview_url
}
})
.finally(() => {})

6
pages/invite/index.vue
Unescape View File

@ -5,7 +5,7 @@
</view>
<view class="invite-hd">
<image :src="$picUrl+'/static/news/invite-bg.png'"></image>
<view class="btn"></view>
<view class="btn" @click="openPage(3)"></view>
<view class="rule" @click="openPage(4)"></view>
</view>
<view class="invite-bd">
@ -55,10 +55,10 @@
</view>
</view>
</view>
<view class="invite-bd-d">
<!-- <view class="invite-bd-d">
<image :src="$picUrl+'/static/news/invite-bg4.png'"></image>
<view class="p" @click="openPage(3)">立即邀请</view>
</view>
</view> -->
</view>
<!-- -->
<view class="invite-popup" v-if="isPopup">

5
pages/news/rules/rulesList.vue
Unescape View File

@ -26,14 +26,15 @@
}
},
onLoad(options) {
this.itemInfo = JSON.parse(options.itemInfo)
this.itemInfo = JSON.parse(decodeURIComponent(options.itemInfo))
console.log(this.itemInfo )
this.title = this.itemInfo.name
this.list = this.itemInfo.child
},
methods: {
goRules(item) {
uni.navigateTo({
url: '/pages/news/rules/index?itemInfo=' + JSON.stringify(item)
url: '/pages/news/rules/index?itemInfo=' + encodeURIComponent(JSON.stringify(item))
})
}
}

2
pages/news1/help.vue
Unescape View File

@ -50,7 +50,7 @@
methods: {
goListPage(item) {
uni.navigateTo({
url: '/pages/news/rules/rulesList?itemInfo=' + JSON.stringify(item)
url: '/pages/news/rules/rulesList?itemInfo=' + encodeURIComponent(JSON.stringify(item))
})
},
getHelpList() {

7
pages/user/index.vue
Unescape View File

@ -120,7 +120,7 @@
<view class="sell">
会员分销
</view>
<view class="type" @click="goJump('/pages/news/user/vip')">
<view class="type" @click="goManagementHandle('/pages/news/user/vip','会员管理')">
<view class="typeLeft common">
会员管理<u-icon style="margin-left: 10rpx;" name="arrow-right"></u-icon>
</view>
@ -529,7 +529,7 @@
</view>
<view class="price">
<text style="font-size: 20rpx;">￥</text>
<text style="font-weight: bold;font-size: 36rpx;">{{item.goods_price_max}}</text>
<text style="font-weight: bold;font-size: 36rpx;">{{item.goods_price_min}}</text>
<text style="font-size: 20rpx;margin-left:10rpx;">到手价</text>
<text
style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
@ -618,6 +618,7 @@
let rawData = JSON.parse(res.rawData)
this.userInfo.avatar_url = rawData.avatarUrl;
this.userInfo.nick_name = rawData.nickName;
console.log("用户信息", JSON.parse(res.rawData))
if (rawData) {
that.headImgUpload(rawData.avatarUrl, rawData.nickName)
} else {
@ -627,7 +628,7 @@
}
})
},
nickSubmit(avatar_id, nick_name) {
nickSubmit(avatar_id,nick_name) {
UserApi.editUser({
avatar_id: avatar_id,
nick_name: nick_name

27
pages/user/vip/goods.vue
Unescape View File

@ -2,7 +2,8 @@
<view class="goods">
<u-navbar>
<view class="slot-wrap">
<u-search @click="openPage()" placeholder="iPhone 15" disabled :show-action="false" v-model="keyword"></u-search>
<u-search @click="openPage()" placeholder="iPhone 15" disabled :show-action="false" v-model="keyword">
</u-search>
</view>
</u-navbar>
<view class="goods-hd">
@ -28,8 +29,8 @@
<view class="item" @click="tabFilter(3,7)" :class="filterIndex==3?'item-on':''">综合</view>
</view>
<scroll-view scroll-y class="l">
<view class="item" v-for="(item,index) in list" v-if="list.length>0" :key="index" @click="goodsDetail(item.goods_id)"
:isLoading="isLoading">
<view class="item" v-for="(item,index) in list" v-if="list.length>0" :key="index"
@click="goodsDetail(item.goods_id)" :isLoading="isLoading">
<image :src="item.goods_image"></image>
<view class="title">
<text>自营</text>{{item.goods_name}}
@ -69,9 +70,13 @@
categoryChildren: [],
list: [],
swiperList: [],
orderSort: 1
orderSort: 1,
type: 0
}
},
onLoad(op) {
this.type = op.type
},
/**
* 生命周期函数--监听页面显示
*/
@ -94,7 +99,7 @@
// 获取分类
getCategoryList() {
const app = this;
Api.category()
Api.category({is_in_store:this.type==1?1:0})
.then(result => {
app.categoryList = result.data.list;
app.categoryChildren = result.data.list[0].children;
@ -111,13 +116,14 @@
is_brand: 1,
is_new: 0,
categoryId: categoryId,
order: app.orderSort
order: app.orderSort,
is_in_store:this.type==1?1:0
}
Api.brandList(pamars)
.then(result => {
let arr = result.data.data;
if(arr && arr.length > 0){
arr.map(a=>{
if (arr && arr.length > 0) {
arr.map(a => {
a.goods_price_min = Number(a.goods_price_min)
a.goods_price_max = Number(a.goods_price_max)
a.line_price_min = Number(a.line_price_min)
@ -129,12 +135,12 @@
.finally(() => app.isLoading = false)
},
tabItem(index, item) {
console.log(item,'1')
console.log(item, '1')
this.tabIndex = index;
this.getBrandList(item.category_id)
},
tabItem1(item, index) {
console.log(item,'2')
console.log(item, '2')
this.tabIndex1 = index;
let app = this;
app.categoryChildren = [];
@ -183,6 +189,7 @@
&-hd {
width: 100%;
height: 400rpx;
image {
width: 100%;
height: 100%;

Write Preview
Loading…
Cancel
Save