uopdate about conflict
This commit is contained in:
cmxdd
@@ -3,10 +3,10 @@
|
||||
<view class="title">我的商品</view>
|
||||
<u-checkbox-group>
|
||||
<view class="list">
|
||||
<shopItem @xuanzhong="xuanzhong" class="items" v-for="(i,j) in list" :key="j" :image="i.goods_image" :title="i.goods_name" :price="i.goods_marketprice" :num="i.goods_salenum" :sid="i.goods_id" ref="shop"></shopItem>
|
||||
<shopItem @xuanzhong="xuanzhong" :wxuanzhong="sele.indexOf(i.goods_id + '') > -1" class="items" v-for="(i,j) in list" :key="j" :image="i.goods_image" :title="i.goods_name" :price="i.goods_marketprice" :num="i.goods_salenum" :sid="i.goods_id" ref="shop"></shopItem>
|
||||
</view>
|
||||
</u-checkbox-group>
|
||||
<view class="jiaru" @click="jiaru">加入售货袋</view>
|
||||
<view class="jiaru" @click="jiaru" :style="{'background-color': sele.length > 0 ? 'rgba(255, 120, 15, 1' : ''}">加入售货袋</view>
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
@@ -45,6 +45,11 @@ export default {
|
||||
}
|
||||
},
|
||||
onLoad(){
|
||||
this.sele = uni.getStorageSync("gouwudai").split(',')
|
||||
if(this.sele[0] == ""){
|
||||
this.sele = []
|
||||
}
|
||||
console.log(this.sele[0])
|
||||
this.$u.api.getStoreGoodsList().then((res)=>{
|
||||
this.list = res.data.list
|
||||
})
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
<template>
|
||||
<!-- tosign页面 -->
|
||||
<view>
|
||||
<view class="tosign">
|
||||
<view class="tosign" style="padding-bottom:180rpx">
|
||||
<image class="images" src="../../static/image/login/login(2).png"></image>
|
||||
<view class="backes"></view>
|
||||
<!-- z自定义导航卡 -->
|
||||
<u-navbar title="" class="content" :background="background" :is-back="false" :border-bottom="false">
|
||||
<!-- <image src="../../static/image/tosign/tosigin(4).png"></image> -->
|
||||
<image src="../../static/image/tosign/tosigin(1).png"></image>
|
||||
<image src="../../static/image/tosign/tosigin(1).png" @click="fanhui"></image>
|
||||
</u-navbar>
|
||||
|
||||
<view id="content_tosign">
|
||||
@@ -21,18 +21,19 @@
|
||||
</u-form-item>
|
||||
<view class="values"><text>{{20 - form.text.length}}</text>/20</view>
|
||||
<u-form-item label-position="right" >
|
||||
<u-input v-model="form.values" placeholder="我的售货袋" @click="navto('selectshop')"/>
|
||||
<u-input :disabled="true" v-model="form.values" placeholder="我的售货袋" @click="navto('selectshop')"/>
|
||||
<view class="rightes" @click="navto('selectshop')">售货袋</view>
|
||||
</u-form-item>
|
||||
</u-form>
|
||||
<!-- 标签的引入 -->
|
||||
<tap_tosign :fileListes="fileListes" @chuangjian="chuangjian" @qiehuan="qiehuan"></tap_tosign>
|
||||
<view class="titles">直播封面图</view>
|
||||
<u-upload :form-data="{'name':'article_cover'}" action='https://dmmall.sdbairui.com/storeapi/Upload/uploadFile' name="article_cover" :header="{'Authorization' : 'Bearer' + ' ' + token}" :max-count="1" :show-progress="true" @on-change="tupian" del-color="#ececec" upload-text="上传" del-bg-color="#fff"></u-upload>
|
||||
<u-upload :form-data="{'name':'article_cover'}" action='https://dmmall.sdbairui.com/storeapi/Upload/uploadFile' name="article_cover" :header="{'Authorization' : 'Bearer' + ' ' + token}" :max-count="1" :show-progress="true" @on-change="tupian" @on-success="sccg" del-color="#ececec" upload-text="上传" del-bg-color="#fff" :before-upload="shangchuan"></u-upload>
|
||||
</view>
|
||||
<view class="button-uview">
|
||||
<u-button @click="kaibo">{{relerest}}</u-button>
|
||||
<u-button :hair-line="false" @click="kaibo">{{relerest}}</u-button>
|
||||
</view>
|
||||
<u-toast ref="uToast" />
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -65,6 +66,20 @@
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
fanhui(){
|
||||
this.$u.route({
|
||||
type:"back",
|
||||
delta:1
|
||||
})
|
||||
},
|
||||
shangchuan(){
|
||||
uni.showLoading({
|
||||
title: '上传中'
|
||||
});
|
||||
},
|
||||
tupian(){
|
||||
uni.hideLoading()
|
||||
},
|
||||
// 选中某个复选框时，由checkbox时触发
|
||||
checkboxChange(e) {
|
||||
//console.log(e);
|
||||
@@ -108,6 +123,12 @@
|
||||
cover_img:this.image
|
||||
}).then((res)=>{
|
||||
console.log(res)
|
||||
if(res.errCode == 1){
|
||||
this.$refs.uToast.show({
|
||||
title: res.message,
|
||||
type: 'error'
|
||||
});
|
||||
}
|
||||
this.$u.route({
|
||||
url:"/pages/release/zhibo",
|
||||
params:{
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<template>
|
||||
<div>
|
||||
<live-pusher id='livePusher' ref="livePusher" class="livePusher" :url="url"
|
||||
mode="SD" :muted="false" :enable-camera="true" :auto-focus="true" :beauty="meiyan + 1" whiteness="2"
|
||||
mode="FHD" :muted="false" :enable-camera="true" :auto-focus="true" :beauty="meiyan + 1" whiteness="0"
|
||||
aspect="9:16" @statechange="statechange" @netstatus="netstatus" @error = "error"
|
||||
:style="{'height':height + 'px'}"
|
||||
></live-pusher>
|
||||
<div class="bottom" :style="{'height':height + 'px'}" v-if="show" @click="show = false">
|
||||
<div class="bottom" :style="{'height':height }" v-if="show" @click="show = false">
|
||||
<div class="tanchuceng" @click="zuzhi">
|
||||
<div class="head">
|
||||
<div style="flex-direction: row;align-items:center">
|
||||
@@ -231,6 +231,8 @@
|
||||
overflow: hidden;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 750rpx;
|
||||
height: 335rpx;
|
||||
}
|
||||
.menutitle{
|
||||
font-size: 30rpx;
|
||||
@@ -290,22 +292,61 @@
|
||||
chatRoomService:{},
|
||||
danmulist:[]
|
||||
},
|
||||
onReady() {
|
||||
// 注意：需要在onReady中 或 onLoad 延时
|
||||
this.context = uni.createLivePusherContext("livePusher", this);
|
||||
onLaunch: function() {
|
||||
console.log('App Launch');
|
||||
},
|
||||
onShow: function() {
|
||||
this.stop()
|
||||
this.startPreview()
|
||||
let that = this
|
||||
uni.getSystemInfo({
|
||||
success(a){
|
||||
console.log(a.windowHeight)
|
||||
that.height = a.windowHeight
|
||||
// that.start()
|
||||
|
||||
}
|
||||
this.start()
|
||||
},
|
||||
onHide: function() {
|
||||
console.log('App Hide');
|
||||
},
|
||||
//模拟onshow生命周期
|
||||
created() {
|
||||
//监听当前窗口显示
|
||||
currentWebview.addEventListener('show',e=>{
|
||||
console.log('search show');
|
||||
this.startPreview()
|
||||
this.start()
|
||||
})
|
||||
},
|
||||
|
||||
//摧毁之前的声明周期
|
||||
beforeDestroy() {
|
||||
//移除监听事件
|
||||
console.log(123)
|
||||
currentWebview.removeEventListener('show',e=>{})
|
||||
},
|
||||
onReady() {
|
||||
// 注意：需要在onReady中 或 onLoad 延时
|
||||
let that = this
|
||||
setTimeout(()=>{
|
||||
uni.getSystemInfo({
|
||||
success(a){
|
||||
console.log(a.windowHeight,1212)
|
||||
that.height = a.windowHeight
|
||||
// that.start()
|
||||
setTimeout(()=>{
|
||||
that.context = uni.createLivePusherContext("livePusher", that);
|
||||
that.startPreview()
|
||||
|
||||
|
||||
|
||||
},500)
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
},500)
|
||||
|
||||
},
|
||||
|
||||
onLoad(a){
|
||||
console.log(getApp().globalData.im)
|
||||
|
||||
this.url = a.url.replace("*","&")
|
||||
let that = this
|
||||
const token = uni.getStorageSync('token');
|
||||
@@ -336,7 +377,7 @@
|
||||
console.log(uni.getStorageSync('userinfo'),123)
|
||||
//当前用户
|
||||
var currentUser = {
|
||||
id : res.data.data.memberInfo.member_id + "",
|
||||
id : Date.parse(new Date()) + "",
|
||||
nickname : res.data.data.memberInfo.member_nickname + "",
|
||||
avatar: res.data.data.memberInfo.member_avatar
|
||||
};
|
||||
@@ -345,11 +386,11 @@
|
||||
id : a.id + "",
|
||||
name : a.id + ""
|
||||
};
|
||||
console.log(room)
|
||||
that.chatRoomService = getApp().globalData.im
|
||||
console.log(room,currentUser)
|
||||
//构造chatRoomService
|
||||
that.chatRoomService = new ChatRoomService(room, currentUser);
|
||||
that.chatRoomService.subscribeRoomMessage(room,currentUser)
|
||||
that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
|
||||
that.chatRoomService.connectGoEasyIM();
|
||||
//获取当前聊天室数据
|
||||
that.room = that.chatRoomService.room;
|
||||
}
|
||||
@@ -490,6 +531,7 @@
|
||||
},
|
||||
statechange(e) {
|
||||
console.log("statechange:" + JSON.stringify(e));
|
||||
console.log(e)
|
||||
},
|
||||
netstatus(e) {
|
||||
// console.log("netstatus:" + JSON.stringify(e));
|
||||
@@ -498,6 +540,7 @@
|
||||
console.log("error:" + JSON.stringify(e));
|
||||
},
|
||||
start: function() {
|
||||
console.log("开始")
|
||||
console.log(this.url)
|
||||
this.context.start({
|
||||
success: (a) => {
|
||||
|
||||
Reference in New Issue
Block a user