From dcdb0231034810232f2542f3865666ebf72daf11 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 四月 2025 16:45:34 +0800
Subject: [PATCH] sf
---
h5/pages/index/index.vue | 107 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 60 insertions(+), 47 deletions(-)
diff --git a/h5/pages/index/index.vue b/h5/pages/index/index.vue
index 8a67013..4ac7cd0 100644
--- a/h5/pages/index/index.vue
+++ b/h5/pages/index/index.vue
@@ -2,8 +2,8 @@
<view class="box">
<view class="box_bg" :style="{backgroundImage: 'url(' + Config.resourcePath + Config.bgImg + ')'}"></view>
<view class="box_user">
- <text>娆㈣繋{{User.username}}鐧诲綍</text>
- <view class="box_user_btn" @click="loginOut">閫�鍑虹櫥褰�</view>
+ <text>{{User.username}}</text>
+ <image src="@/static/ic_logout@2x.png" mode="widthFix" @click="loginOut"></image>
</view>
<view class="box_content" :style="{maxWidth: Config.rangeSize + 'px', minWidth: Config.rangeSize + 'px'}">
<!-- 骞垮憡鍥� -->
@@ -198,16 +198,19 @@
</view>
</view>
<view class="productPage_shop" v-if="status === 1 && !pkcontent">
- <view class="productPage_shop_item" v-for="(item, index) in isSOU ? shopPageDataSou : shopPageData" :key="index" @click="clickshoppageItem(item)">
- <view class="productPage_shop_item_img">
- <image :src="item.imgurl ? item.prefixUrl + item.imgurl : ''" mode="widthFix"></image>
+ <noData v-if="shopPageData.length === 0 && shopPageDataSou.length === 0" />
+ <template v-else>
+ <view class="productPage_shop_item" v-for="(item, index) in isSOU ? shopPageDataSou : shopPageData" :key="index" @click="clickshoppageItem(item)">
+ <view class="productPage_shop_item_img">
+ <image :src="item.imgurl ? item.prefixUrl + item.imgurl : ''" mode="widthFix"></image>
+ </view>
+ <!-- stringOperations(item.name, 6) -->
+ <text>{{item.name}}</text>
</view>
- <!-- stringOperations(item.name, 6) -->
- <text>{{item.name}}</text>
- </view>
- <view class="productPage_shop_zw"></view>
- <view class="productPage_shop_zw"></view>
- <view class="productPage_shop_zw"></view>
+ <view class="productPage_shop_zw"></view>
+ <view class="productPage_shop_zw"></view>
+ <view class="productPage_shop_zw"></view>
+ </template>
</view>
<!-- v-if="status === 2" -->
<view class="productPage_parameter" v-if="isPK && pkcontent">
@@ -231,7 +234,7 @@
<view class="label">{{child.name}}锛�</view>
<view class="value">{{child.val}}</view>
</view>
- <view v-if="item.param2" class="paramline"></view>
+ <view v-if="item.param2.length>0" class="paramline"></view>
<view class="item" v-if="item.param2" v-for="(child, j) in item.param2" :key="child.index">
<view class="label">{{child.name}}锛�</view>
<view class="value">{{child.val}}</view>
@@ -242,12 +245,6 @@
</view>
</view>
</template>
-
- <!-- 鏌ョ湅澶у浘 -->
- <bigImg
- ref="bigImg"
- :imgList="imgList"/>
- <!-- 鎼滅储 -->
<!-- 鎼滅储缁勪欢 -->
<search
@@ -263,10 +260,10 @@
</template>
<script>
- import bigImg from '@/components/bigImg.vue'
import search from '@/components/search.vue'
+ import noData from '@/components/noData.vue'
import { mapState } from 'vuex'
- import { categoryList, goodsList, brandList, h5Image, goodsPage, listForH5 } from '@/apis/index.js'
+ import { categoryList, goodsList, brandList, h5Image, goodsPage, listForH5, logout } from '@/apis/index.js'
export default {
data() {
return {
@@ -343,7 +340,7 @@
page: 1
}
},
- components: { bigImg, search },
+ components: { search, noData },
onLoad() {
var that = this
// 鐩戝惉閿洏缁勫悎閿�
@@ -426,6 +423,14 @@
}
}
}
+ },
+ onUnload() {
+ //娓呴櫎
+ document.onmouseup = function(ev){
+ document.onmousemove = null;
+ }
+ //娓呴櫎
+ document.onkeydown = null
},
computed: {
// 鎸囧浠锋�昏
@@ -542,8 +547,11 @@
},
// 閫�鍑�
loginOut() {
- this.$store.commit('clean')
- uni.redirectTo({ url: '/pages/login/login' });
+ logout({})
+ .then(res => {
+ this.$store.commit('clean')
+ uni.redirectTo({ url: '/pages/login/login' });
+ })
},
// 鏌ヨ鍟嗗搧鏁版嵁
getShopList(type) {
@@ -699,7 +707,10 @@
})
}
})
- this.$refs.bigImg.open(0)
+ if (this.imgList.length === 0) return
+ this.$viewerApi({
+ images: this.imgList,
+ })
},
empty() {
this.shopList = []
@@ -829,6 +840,7 @@
this.shopList[index].zdPrice = ''
this.shopList[index].price = ''
this.shopList[index].xhData = []
+ this.shopList[index].multifileList = []
this.shopList[index].ppShow = false
this.$forceUpdate()
},
@@ -922,12 +934,15 @@
},
copyItem(item) {
let obj = JSON.parse(JSON.stringify(item))
+ obj.multifileList = []
+ obj.xhData = []
obj.brandId = ''
obj.brand = ''
obj.brandName = ''
obj.name = ''
obj.zdPrice = ''
obj.price = ''
+ console.log(obj)
this.shopList.push(obj)
},
deleItem(i) {
@@ -1096,7 +1111,7 @@
background-size: 100% 100%;
}
.box_user {
- z-index: 99;
+ z-index: 9;
position: fixed;
top: 30px;
right: 40px;
@@ -1108,19 +1123,11 @@
font-weight: 500;
color: #FFFFFF;
}
- .box_user_btn {
- width: 80px;
- height: 34px;
- line-height: 34px;
- text-align: center;
- border-radius: 8px;
- border: 2px solid #FFFFFF;
- font-size: 16px;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #FFFFFF;
- margin-left: 22px;
+ image {
+ width: 18px;
+ height: 18px;
cursor: pointer;
+ margin-left: 10px;
}
}
.box_content {
@@ -1128,7 +1135,7 @@
// min-width: 750px;
.box_content_left {
position: fixed;
- left: 50px;
+ left: 80px;
top: 50%;
cursor: pointer;
transform: translate(-50%, 0);
@@ -1142,7 +1149,7 @@
}
.box_content_right {
position: fixed;
- right: 50px;
+ right: 0px;
top: 50%;
cursor: pointer;
transform: translate(-50%, 0);
@@ -1185,7 +1192,7 @@
margin-top: 16px;
.commodityFrom_head {
width: 100%;
- height: 60px;
+ height: 45px;
padding: 10px 8px;
box-sizing: border-box;
background: rgba(0,224,255,0.24) linear-gradient(180deg, rgba(255,255,255,0.35) 0%, rgba(0,0,0,0.21) 100%);
@@ -1232,7 +1239,7 @@
flex-direction: column;
.commodityFrom_body_content_item {
width: 100%;
- height: 56px;
+ height: 45px;
display: flex;
align-items: center;
margin-bottom: 6px;
@@ -1253,7 +1260,7 @@
opacity: 0;
transform: translate(0%, 0%);
z-index: -1;
- height: 56px;
+ height: 45px;
display: flex;
align-items: center;
background: rgba(0,224,255,0.3);
@@ -1326,8 +1333,11 @@
font-weight: 500;
}
.commodityFrom_body_content_item_num_img {
- width: 24px;
- height: 24px;
+ width: 28px;
+ height: 28px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
margin-right: 4px;
image {
width: 100%;
@@ -1379,6 +1389,8 @@
display: flex;
align-items: center;
justify-content: center;
+ padding: 0 10px;
+ box-sizing: border-box;
&:hover {
text {
color: #FFF200;
@@ -1402,7 +1414,7 @@
}
.commodityFrom_body_total {
width: 100%;
- height: 56px;
+ height: 45px;
display: flex;
align-items: center;
.commodityFrom_body_total_item {
@@ -1494,7 +1506,6 @@
}
}
}
-
.productPage {
width: 100%;
padding: 0 22px;
@@ -1502,7 +1513,7 @@
margin-top: 16px;
.productPage_head {
width: 100%;
- height: 60px;
+ height: 45px;
display: flex;
align-items: center;
background: rgba(0,224,255,0.34) linear-gradient(180deg, rgba(255,255,255,0.35) 0%, rgba(0,0,0,0.21) 100%);
@@ -1567,6 +1578,8 @@
line-height: 40px;
text-align: center;
cursor: pointer;
+ padding: 0 10px;
+ box-sizing: border-box;
&:hover {
text {
color: #FFF200;
--
Gitblit v1.9.3