Merge pull request 'zmr' (#56) from zmr into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/56
This commit is contained in:
zhaomingrui 2020-07-13 11:27:15 +08:00
commit 58b02c7432
11 changed files with 209 additions and 83 deletions

View File

@ -256,6 +256,34 @@ export default {
if(file) Object.assign(params, { file: file }); if(file) Object.assign(params, { file: file });
return vm.$u.post('Order/orderEvaluate', params); return vm.$u.post('Order/orderEvaluate', params);
}, },
// 信息模块
messageIndex({ }) {
return vm.$u.post('Message/messageIndex', { });
},
// 公告咨询列表
informationList({ }) {
return vm.$u.post('Message/informationList', { });
},
// 关注列表
snsfriendList({ }) {
return vm.$u.post('message/snsfriendList', { });
},
// 公告消息列表
informationInfo({ }) {
return vm.$u.post('message/informationInfo', { });
},
// 活动消息列表
messageactivityList({ }) {
return vm.$u.post('message/messageactivityList', { });
},
// 全部已读接口
delMessage({ type }) {
return vm.$u.post('message/delMessage', { type });
},
// 已读消息
delMessage({ type }) {
return vm.$u.post('/message/readMessage', { type });
},
} }
} }
} }

View File

@ -53,6 +53,7 @@
</style> </style>
<script> <script>
export default { export default {
props:['information'],
name: "info_title", name: "info_title",
data() { data() {
@ -110,6 +111,11 @@
default: default:
break; break;
} }
},
//
messageIndex(){
console.log("333")
} }
} }
} }

View File

@ -26,7 +26,7 @@
</view> </view>
<u-checkbox-group @change="checkboxGroupChange" size="27"> <u-checkbox-group @change="checkboxGroupChange" size="27">
<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name" <u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name"
shape="circle" size="14" active-color="#19BE6B"></u-checkbox> shape="circle" size="30" active-color="#19BE6B"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
</view> </view>
</view> </view>
@ -159,32 +159,32 @@
}) })
return false return false
}else{ }else{
// uni.setStorageSync('token', res.data.token);//
uni.setStorage({
key: 'user_info',
data: res.data,
success: function() {
console.log('success');
//
uni.navigateTo({ uni.navigateTo({
url : '/pageA/topick/topick' url : '/pageA/topick/topick'
}) })
//
// uni.setStorageSync({
// key: 'user_info',
// data: res.data,
// success: function() {
// console.log('success');
// //
// uni.navigateTo({
// url : '/pageA/topick/topick'
// })
// }
// });
} }
});
}
// token // token
uni.setStorage({ uni.setStorageSync('token', res.data.token);//
key: 'token', // //
data: res.data.token, // this.$refs.uToast.show({
}); // title: res.message,
// // type: 'success',
this.$refs.uToast.show({ // url: '/pageA/topick/topick'
title: res.message, // })
type: 'success',
url: '/pageA/topick/topick'
})
} }
if (res.errCode == 1) { if (res.errCode == 1) {
this.$refs.uToast.show({ this.$refs.uToast.show({
@ -296,7 +296,10 @@
width: 630rpx; width: 630rpx;
margin: 0 auto; margin: 0 auto;
} }
.u-checkbox__icon-wrap .u-icon{
width: 26rpx!important;
height: 26rpx;
}
.more_Login text { .more_Login text {
display: inline-block; display: inline-block;
width: 50%; width: 50%;

View File

@ -6,7 +6,7 @@
<view class="backes"></view> <view class="backes"></view>
<view class="content"> <view class="content">
<view class="title">手机注册</view> <view class="title">手机注册</view>
<view class="labales"> <view class="labales phones">
<!-- <text></text> --> <!-- <text></text> -->
<input type="tel" placeholder="请输入您的手机号" v-model="member_mobile" /> <input type="tel" placeholder="请输入您的手机号" v-model="member_mobile" />
</view> </view>
@ -21,9 +21,7 @@
<view class="pact"> <view class="pact">
<view></view> <view></view>
<text>我已详细阅读并同意</text> <text>我已详细阅读并同意</text>
<text class="pact_text">用户协议</text> <text class="pact_text" v-for="(item,index) in pact_text" :key="index" @click="pact_click(index)"> {{item.text}} </text>
<text class="pact_text">隐私协议</text>
<text class="pact_text">使用协议</text>
<u-checkbox-group @change="checkboxGroupChange" size="27"> <u-checkbox-group @change="checkboxGroupChange" size="27">
<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name" <u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name"
shape="circle" size="14" active-color="#19BE6B" ></u-checkbox> shape="circle" size="14" active-color="#19BE6B" ></u-checkbox>
@ -72,12 +70,32 @@
member_mobile: '', // member_mobile: '', //
smslog_type : '1',// smslog_type : '1',//
sms_code : '', // sms_code : '', //
//
pact_text: [{
"id": '1',
"text": "《用户协议》"
}, {
"id": '2',
"text": "《隐私协议》"
}, {
"id": '3',
"text": "《使用协议》"
},
]
}; };
}, },
onLoad() { onLoad() {
}, },
methods: { methods: {
//
pact_click(index){
console.log(index)
uni.navigateTo({
url: '/pageA/pactList/pactList?index=' + index
});
},
// //
loginIn(){ loginIn(){
let type_phone = this.$u.test.mobile( this.member_mobile) let type_phone = this.$u.test.mobile( this.member_mobile)
@ -113,8 +131,8 @@
if(res.errCode == 0){ if(res.errCode == 0){
// //
uni.setStorage({ uni.setStorage({
key: 'user_info', key: 'token',
data: res.data, data: res.data.token,
success: function () { success: function () {
console.log('success'); console.log('success');
// //
@ -421,4 +439,7 @@
// text-overflow: ellipsis; // // text-overflow: ellipsis; //
// white-space: nowrap; // // white-space: nowrap; //
} }
.phones{
margin-bottom: 90rpx!important;
}
</style> </style>

View File

@ -34,9 +34,14 @@
}; };
}, },
onLoad(){ onLoad(){
//
console.log("11111222")
this.$u.api.labelList({
// }).then((res) => {
this.labelList() console.log(res)
this.tab_lables = res.data
})
}, },
mounted(){ mounted(){
@ -68,16 +73,7 @@
url: '/pages/index/index' url: '/pages/index/index'
}); });
}, },
//
labelList(){
console.log("11111222")
this.$u.api.labelList({
}).then((res) => {
console.log(res)
this.tab_lables = res.data
})
},
} }
}; };
</script> </script>

View File

@ -4,11 +4,11 @@
<view class="activity" v-for="(item, index) in actives" :key="index"> <view class="activity" v-for="(item, index) in actives" :key="index">
<view class="times">{{item.type}}</view> <view class="times">{{item.type}}</view>
<view class="content"> <view class="content">
<view class="title">{{item.name}}</view> <view class="title">{{item.title}}</view>
<view class="images_about"> <view class="images_about">
<image :src="item.url"></image> <image :src="item.goods_image"></image>
<view> <view>
<text>{{item.about}}</text> <text>{{item.summary}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -21,43 +21,23 @@
data() { data() {
return { return {
actives: [ actives: [
{
url: '../../pageE/static/mine/1.png',
name: '百元趋势新品',
type: '2020-05-14 20:11',
about: '百搭休闲格纹裙!你值得有用!'
},
{
url: '../../pageE/static/mine/1.png',
name: '百元趋势新品',
type: '2020-05-14 20:11',
about: '百搭休闲格纹裙!你值得有用!'
},
{
url: '../../pageE/static/mine/1.png',
name: '百元趋势新品',
type: '2020-05-14 20:11',
about: '百搭休闲格纹裙!你值得有用!'
},
{
url: '../../pageE/static/mine/1.png',
name: '百元趋势新品',
type: '2020-05-14 20:11',
about: '百搭休闲格纹裙!你值得有用!'
},
{
url: '../../pageE/static/mine/1.png',
name: '百元趋势新品',
type: '2020-05-14 20:11',
about: '百搭休闲格纹裙!你值得有用!'
},
] ]
}; };
}, },
onLoad(){
this.messageactivityList()
},
methods: { methods: {
titletext(){ titletext(){
console.log("22345") console.log("22345")
},
//
messageactivityList(){
this.$u.api.messageactivityList({}).then((res)=>{
console.log(res)
this.actives = res.data
})
} }
}, },
components:{ components:{
@ -66,6 +46,9 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
uni-page-body{
height: 100%;
}
#actives{ #actives{
background: #ECECEC; background: #ECECEC;
height: 100%; height: 100%;
@ -106,6 +89,10 @@
width: 400rpx; width: 400rpx;
padding-left: 15rpx; padding-left: 15rpx;
line-height: 36rpx; line-height: 36rpx;
display: block;
overflow:hidden; //
text-overflow:ellipsis; //
white-space:nowrap; //
} }
view{ view{
display: inline-block; display: inline-block;

View File

@ -52,6 +52,9 @@
] ]
}; };
}, },
onLoad(){
this.snsfriendList()
},
methods: { methods: {
// //
tapClick(index) { tapClick(index) {
@ -63,6 +66,12 @@
this.rSelect.splice(this.rSelect.indexOf(index), 1); // this.rSelect.splice(this.rSelect.indexOf(index), 1); //
} }
},
snsfriendList(){
this.$u.api.snsfriendList({}).then((res)=>{
console.log(res)
// this.attention = res.data
})
} }
}, },
components: { components: {

View File

@ -12,9 +12,17 @@
return { return {
}; };
}, },
onLoad(){
this.informationList()
},
methods: { methods: {
titletext(){ titletext(){
console.log("22345") console.log("22345")
},
informationList(){
this.$u.api.informationList({}).then((res)=>{
console.log(res)
})
} }
}, },
components:{ components:{

View File

@ -2,7 +2,7 @@
<view> <view>
<u-navbar :is-back="false" :title-size="36" title="消息"> <u-navbar :is-back="false" :title-size="36" title="消息">
<view class="slot-wrap"> <view class="slot-wrap">
<image src="../../static/pageD/info(3).png"></image> <image src="../../static/pageD/info(3).png" @click="delMessage()"></image>
<image src="../../static/pageD/info(2).png"></image> <image src="../../static/pageD/info(2).png"></image>
</view> </view>
</u-navbar> </u-navbar>
@ -11,7 +11,7 @@
</view> </view>
<view class="sousuo"></view> <view class="sousuo"></view>
<view class="backes"> <view class="backes">
<titles></titles> <titles :information="information_dles"></titles>
</view> </view>
<!-- 消息通知 --> <!-- 消息通知 -->
<view class="backes"> <view class="backes">
@ -20,12 +20,13 @@
<view> <view>
<image :src="item.url"></image> <image :src="item.url"></image>
</view> </view>
<view class="title">{{item.text}}</view> <view class="title">{{item.title}}</view>
<view class="contentes">{{item.contentes}}</view> <view class="contentes">{{item.contentes}}</view>
<view class="times">{{item.title}}</view> <view class="times">{{item.title}}</view>
</view> </view>
</view> </view>
</view> </view>
<u-toast ref="uToast" />
</view> </view>
</template> </template>
@ -34,6 +35,29 @@
export default { export default {
data() { data() {
return { return {
information_dles : [{
id: 0,
url: '../../static/pageD/info(11).png',
text: '公告/资讯'
},
{
id: 0,
url: '../../static/pageD/info(6).png',
text: '活动消息'
},
{
id: 0,
url: '../../static/pageD/info(14).png',
text: '交易物流'
},
{
id: 0,
url: '../../static/pageD/info(15).png',
text: '关注消息'
},
],
// //
information_dl: [{ information_dl: [{
id: 0, id: 0,
@ -63,6 +87,10 @@
show: false show: false
}; };
}, },
onLoad() {
// /
this.messageIndex()
},
methods: { methods: {
// checkbox // checkbox
checkboxChange(e) { checkboxChange(e) {
@ -75,6 +103,46 @@
mask_u() { mask_u() {
this.show = !this.show this.show = !this.show
}, },
//
messageIndex(){
console.log("消息模块的读取消息模块的读取消息模块的读取")
this.$u.api.messageIndex({}).then((res)=>{
console.log(res)
let data = res.data.allMessages;
for(let i in data){
var type = data[i].type;
console.log(data[i].type)
var array = []
array.push(type)
}
console.log( array)
//
for(let j = 0; j < this.information_dles.length; j++ ){
console.log()
// this.information_dles[j].type = type;
for(let k = 0; k < array.length; k++ ){
this.information_dles[j].type = array[k];
console.log( array[k])
}
}
console.log(this.information_dles)
})
},
//
delMessage(){
this.$u.api.delMessage({
type : "all"
}).then((res)=>{
console.log(res)
if(res.errCode == 0){
this.$refs.uToast.show({
title: '清除成功',
type: 'success'
})
}
})
}
}, },
components: { components: {