修改首页以及 商品设置问题
This commit is contained in:
jia
parent
b63547a137
commit
049b63eade
@ -1513,7 +1513,6 @@
|
||||
"selectedColor": "#E93323",
|
||||
"borderStyle": "white",
|
||||
"backgroundColor": "#ffffff",
|
||||
"fontSize": "25rpx",
|
||||
"list": [{
|
||||
"pagePath": "pages/index/index",
|
||||
"iconPath": "static/tabbar_icon/a.png",
|
||||
@ -1548,13 +1547,11 @@
|
||||
}
|
||||
],
|
||||
"midButton": {
|
||||
"width": "78rpx",
|
||||
"height": "126rpx",
|
||||
"iconWidth": "78rpx",
|
||||
"width": "68px",
|
||||
"height": "70px",
|
||||
"iconWidth": "48px",
|
||||
"pagePath": "pages/plant_release/index",
|
||||
"iconPath": "static/tabbar_icon/d.png",
|
||||
// "selectedIconPath": "static/tabbar_icon/d-a.png",
|
||||
|
||||
"text": "发布"
|
||||
}
|
||||
|
||||
|
||||
@ -186,12 +186,12 @@
|
||||
|
||||
},
|
||||
onTabItemTap(e) {
|
||||
if (e.text.length>=4) {
|
||||
if (e.text.length >= 4) {
|
||||
uni.pageScrollTo({
|
||||
selector: ".Circle_friends",
|
||||
scrollTop: 0
|
||||
})
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
onReachBottom() {
|
||||
|
||||
@ -132,7 +132,8 @@
|
||||
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>客服电话：</view>
|
||||
<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
|
||||
</view>
|
||||
<view class="item_cell flex_a_c">
|
||||
|
||||
<view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
|
||||
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view>
|
||||
<u-switch v-model="credit_buy" @change="change"></u-switch>
|
||||
</view>
|
||||
@ -154,6 +155,7 @@
|
||||
<text style="color: #CCCCCC;">开启后，店铺即可展示在移动端</text>
|
||||
</view> -->
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
<button class="submit_btn l_center" @click="postMerchantUpdata">提交审核</button>
|
||||
@ -265,7 +267,8 @@
|
||||
credit_buy: false, //开启信用购
|
||||
interest_rate: '', //利率
|
||||
settle_cycle: '', //周期
|
||||
mer_name:''
|
||||
mer_name:'',
|
||||
type_code:''
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
@ -295,6 +298,7 @@
|
||||
res.data.mer_take_day.forEach((item, i) => {
|
||||
this.dateWeek[Number(item) - 1].isCheck = true
|
||||
})
|
||||
this.type_code= res.data.type_code
|
||||
this.mer_take_time = res.data.mer_take_time
|
||||
this.intro = res.data.mer_info
|
||||
this.cruxText = res.data.mer_keyword
|
||||
|
||||
@ -21,6 +21,13 @@
|
||||
】
|
||||
-->
|
||||
<!-- 头部导航 -->
|
||||
<view class="header">
|
||||
<view class="tool-bar">
|
||||
<view class='xiangzuo' @click='goBack()'>
|
||||
<image src="@/static/images/icon-back.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view v-if="!isUser" class="header" :style="{backgroundColor:currentNav==1?'':'#000'}" >
|
||||
<view class="items" @click.stop="navTap(2)">
|
||||
<text class="tName" :class="currentNav==2?'on':''">关注</text>
|
||||
@ -316,13 +323,7 @@
|
||||
</view>
|
||||
</uni-popup>
|
||||
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
|
||||
<view class="fixed-head">
|
||||
<view class="sys-head" :style="{height:statusBarHeight}"></view>
|
||||
<view class="tool-bar" @click='goBack()'>
|
||||
|
||||
<image class="icon-xiangzuo" src="@/static/image/icon-back.png"></image>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
@ -704,16 +705,17 @@
|
||||
// });
|
||||
// })'
|
||||
// that.isUser ?
|
||||
|
||||
videoList({
|
||||
page: that.page,
|
||||
limit: that.limit,
|
||||
id:this.videoID
|
||||
|
||||
}).then(res=>{
|
||||
that.getVideoData(res.data.list);
|
||||
page: that.page,
|
||||
limit: that.limit,
|
||||
id: that.videoID
|
||||
}).then(res => {
|
||||
console.log(res.data.list)
|
||||
that.getVideoData(res.data.list);
|
||||
})
|
||||
|
||||
|
||||
|
||||
|
||||
//:
|
||||
// graphicLstApi({
|
||||
// page: that.page,
|
||||
@ -746,7 +748,7 @@
|
||||
})
|
||||
},
|
||||
getVideoData(list) {
|
||||
|
||||
|
||||
if (list.length == 0) return
|
||||
let that = this;
|
||||
that.loadVideo = list.length == that.limit
|
||||
@ -757,7 +759,7 @@
|
||||
msg[i]['community_id'] = msg[i]['community_id'].toString()
|
||||
that.dataList.push(msg[i])
|
||||
}
|
||||
|
||||
|
||||
if (that.dataList.length !== 0) {
|
||||
that.dataList[that.k].state = 'play';
|
||||
setTimeout(function() {
|
||||
@ -883,8 +885,8 @@
|
||||
// 这个方法主要就是用来第一次进入视频播放时用来处理
|
||||
deoList(this.videoID).then(async (res) => {
|
||||
this.loadVideo = false
|
||||
this.userUid=res.data.uid
|
||||
this.page = this.page + 1;
|
||||
this.userUid = res.data.uid
|
||||
this.page = this.page + 1;
|
||||
var msg = [res.data];
|
||||
for (let i = 0; i < msg.length; i++) {
|
||||
msg[i]['isMore'] = false
|
||||
@ -895,7 +897,7 @@
|
||||
msg[i]['community_id'] = msg[i]['community_id'].toString()
|
||||
}
|
||||
this.dataList = msg;
|
||||
|
||||
|
||||
if (this.dataList.length !== 0) {
|
||||
this.dataList[this.k].state = 'play';
|
||||
uni.createVideoContext(this.dataList[this.k].community_id, this).play()
|
||||
@ -1110,6 +1112,10 @@
|
||||
// background-color: #999;
|
||||
// }
|
||||
// }
|
||||
|
||||
.container{
|
||||
position: relative;
|
||||
}
|
||||
.video-list {
|
||||
// margin: 0 auto;
|
||||
// width: 750rpx;
|
||||
@ -1231,44 +1237,64 @@
|
||||
}
|
||||
}
|
||||
|
||||
.fixed-head {
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
position: fixed;
|
||||
left: 0;
|
||||
top: 70rpx;
|
||||
height: 86rpx;
|
||||
|
||||
.icon-xiangzuo {
|
||||
margin-left: 10px;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
color: #ffffff;
|
||||
}
|
||||
}
|
||||
|
||||
.header {
|
||||
.header {
|
||||
position: fixed;
|
||||
z-index: 9;
|
||||
width: 750rpx;
|
||||
height: 186rpx;
|
||||
height: 120rpx;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
padding-top: 70rpx;
|
||||
padding-top: 20rpx;
|
||||
/* #ifdef MP */
|
||||
padding-top: 75rpx;
|
||||
/* #endif */
|
||||
|
||||
|
||||
.tool-bar {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
width: 60rpx;
|
||||
height: 86rpx;
|
||||
background-color: red;
|
||||
|
||||
.xiangzuo {
|
||||
width: 23rpx;
|
||||
height: 42rpx;
|
||||
margin-right: 40rpx;
|
||||
margin-left: 20rpx;
|
||||
image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.items {
|
||||
margin: 0 30rpx;
|
||||
|
||||
image {
|
||||
width: 58rpx;
|
||||
height: 58rpx;
|
||||
|
||||
}
|
||||
|
||||
.tName {
|
||||
color: #000;
|
||||
font-size: 32rpx;
|
||||
font-size: 33rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #737373;
|
||||
line-height: 50px;
|
||||
|
||||
&.on {
|
||||
font-size: 38rpx;
|
||||
font-size: 33rpx;
|
||||
font-family: PingFang SC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #333333;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -775,8 +775,7 @@
|
||||
page: that.page,
|
||||
limit: that.limit,
|
||||
id: this.videoID
|
||||
// is_star: that.isSatrt,
|
||||
// community_id: that.videoID
|
||||
|
||||
}).then(res => {
|
||||
that.videoData(res.data.list)
|
||||
if (res.data.list.length < that.limit) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user