396316021
/
warm_man
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

对接接口

1.0
396316021 2 years ago
parent
e54d0b02c5
commit
89d0b5b2f1
30 changed files with 1157 additions and 548 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 63
      api/other.js
  2. 24
      api/shop.js
  3. 41
      api/user.js
  4. 6
      config/host.js
  5. 10
      manifest.json
  6. 5
      pages.json
  7. 26
      pages/About/index.vue
  8. 3
      pages/Address/edit.vue
  9. 13
      pages/Address/index.vue
  10. 124
      pages/Authentication/form.vue
  11. 107
      pages/Goods/index.vue
  12. 2
      pages/Index/components/HomePage/index.vue
  13. 8
      pages/Index/components/ShopPage/index.vue
  14. 8
      pages/Index/components/UserPage/index.vue
  15. 4
      pages/Line/components/ListPage/index.vue
  16. 37
      pages/Line/components/SubmitPage/index.vue
  17. 31
      pages/Login/index.vue
  18. 46
      pages/News/components/detail.scss
  19. 74
      pages/News/detail.vue
  20. 91
      pages/News/index.vue
  21. 1
      pages/Order/components/done.scss
  22. 108
      pages/Order/confirm.vue
  23. 326
      pages/Order/detail.vue
  24. 11
      pages/Order/done.vue
  25. 6
      pages/Room/components/index.scss
  26. 91
      pages/Room/index.vue
  27. 90
      pages/Street/index.vue
  28. 9
      pages/User/components/order.scss
  29. 338
      pages/User/order.vue
  30. 2
      project.config.json

63
api/other.js
Unescape View File

@ -0,0 +1,63 @@
import request from "@/utils/request.js";
import {host} from "@/config/host.js";
/**
* 街道联系方式列表
* @param {Object} data
*/
export function streetCallList(data) {
return request({
url: `${host}/common/street-list`,
method: "post",
data
});
}
/**
* 系统配置
* @param {Object} data
*/
export function systemConfig(data) {
return request({
url: `${host}/other/goods-type`,
method: "get",
data
});
}
/**
* 资讯列表
* @param {Object} data
*/
export function newList(data) {
return request({
url: `${host}/other/information-list`,
method: "get",
data
});
}
/**
* 资讯详情
* @param {Object} data
*/
export function newDetail(data) {
return request({
url: `${host}/other/information-info`,
method: "get",
data
});
}
/**
* 页面配置
* @param {Object} data
*/
export function webConfig(data) {
return request({
url: `${host}/other/web-config`,
method: "get",
data
});
}

24
api/shop.js
Unescape View File

@ -60,4 +60,28 @@ export function goodsType(data) {
method: "get",
data
});
}
/**
* 商品详情
* @param {Object} data
*/
export function goodsDetail(data) {
return request({
url: `${host}/market/goodsinfo`,
method: "post",
data
});
}
/**
* 商品规格
* @param {Object} data
*/
export function goodsSpec(data) {
return request({
url: `${host}/market/goods-spec`,
method: "post",
data
});
}

41
api/user.js
Unescape View File

@ -116,4 +116,45 @@ export function userAddrDefault(data) {
method: "post",
data
});
}
export function submitHouseOrder(data) {
return request({
url: `${host}/user/up-houseorder`,
method: "post",
data
});
}
export function submitGoodsOrder(data) {
return request({
url: `${host}/market/create-goodsorder`,
method: "post",
data
});
}
export function goodsOrder(data) {
return request({
url: `${host}/user/goods-order`,
method: "get",
data
});
}
export function roomOrder(data) {
return request({
url: `${host}/user/house-order`,
method: "get",
data
});
}
export function tabCount(data) {
return request({
url: `${host}/user/orderstatus-count`,
method: "get",
data
});
}

6
config/host.js
Unescape View File

@ -1,7 +1,7 @@
const host='http://192.168.2.92:9505/api'
// const host='https://bml.test.scyp.ink/api'
// const host='http://192.168.2.92:9505/api'
const host='https://nxr.test.fanyiguanjia.com/api'
// const host='http://192.168.2.92:9503/api'
const imghost='http://live.admin.jinghkb.com/warm-man'
const title = '汪汪行天下'
const title = '暖新人'
// const codehost='http://code.baomingle.cn'
export {host,imghost,title}

10
manifest.json
Unescape View File

@ -1,6 +1,6 @@
{
"name" : "breed",
"appid" : "__UNI__BA565DD",
"name" : "warm_man",
"appid" : "__UNI__94BF060",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
@ -50,17 +50,17 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
"appid" : "wxe20096a48806d438",
"appid" : "wxf8a4f883afcaefa9",
"setting" : {
"urlCheck" : false
},
"usingComponents" : true,
"requiredPrivateInfos": ["getLocation", "chooseLocation"],
"requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
"permission" : {
"scope.userLocation" : {
"desc" : "获取发生事件位置"
},
"scope.userFuzzyLocation" : {
"scope.userFuzzyLocation" : {
"desc" : "获取发生事件位置"
}
}

5
pages.json
Unescape View File

@ -126,6 +126,11 @@
"style" : {
"navigationBarTitleText" : "支付成功"
}
},{
"path" : "pages/News/detail",
"style" : {
"navigationBarTitleText" : "资讯详情"
}
}
],
"globalStyle" : {

26
pages/About/index.vue
Unescape View File

@ -10,18 +10,7 @@
<u-row :custom-style="{padding:'38rpx 66rpx'}">
<u-col :span="12">
<view class="content">
<view style="font-size: 32rpx;font-weight: 400;color: #020B18;line-height: 50rpx;">
知理，就是懂得做人的道理，具备独立思考的能力。 知理的人，从书本中学习做人的道理，在实践中理解事物的发展规律。在学习知识、探寻真理的过程中，他们形成了自己的世界观和人生观，能够独立思考，不会人云亦云。
</view>
<image style="margin:20px 0;" :src="staticImage.bg" mode="widthFix" class="img"/>
<view style="font-size: 32rpx;font-weight: 400;color: #020B18;line-height: 50rpx;">
知理，就是懂得做人的道理，具备独立思考的能力。 知理的人，从书本中学习做人的道理，在实践中理解事物的发展规律。在学习知识、探寻真理的过程中，他们形成了自己的世界观和人生观，能够独立思考，不会人云亦云。
</view>
<image style="margin:20px 0;" :src="staticImage.bg" mode="widthFix" class="img"/><view>
知理，就是懂得做人的道理，具备独立思考的能力。 知理的人，从书本中学习做人的道理，在实践中理解事物的发展规律。在学习知识、探寻真理的过程中，他们形成了自己的世界观和人生观，能够独立思考，不会人云亦云。
</view>
<image :src="staticImage.bg" mode="widthFix" class="img"/>
<u-parse :content="content"></u-parse>
</view>
</u-col>
</u-row>
@ -33,6 +22,7 @@ import {
} from '@/config/host.js'
import MzSubsection from '@/components/MzSubsection/Index.vue';
import api from '@/utils/functions.js';
import {webConfig} from "@/api/other";
export default {
components: {
@ -41,6 +31,7 @@ export default {
data() {
return {
title: '关于我们',
content:'',
loading: true,
staticImage: {
bg: imghost + '/static/image/BG.png',
@ -58,7 +49,13 @@ export default {
},
},
methods: {
getAboutUs(){
webConfig({type:'about_us'}).then(res => {
if(res.code === 200){
this.content = res.data.about_us;
}
})
}
},
onPageScroll(res) {
if (res.scrollTop <= 20) {
@ -69,6 +66,9 @@ export default {
},
created() {
},
mounted() {
this.getAboutUs();
}
}
</script>

3
pages/Address/edit.vue
Unescape View File

@ -241,7 +241,8 @@ export default {
submit(){
this.$refs.addrForm.validate().then(res => {
let result;
if(this.model.address.id !== ''){
console.log(this.model)
if(this.model.address.id !== '' && this.model.address.id !== undefined){
result = userAddrEdit(this.model.address);
}else{
result = userAddrAdd(this.model.address);

13
pages/Address/index.vue
Unescape View File

@ -21,7 +21,7 @@
:custom-style="{paddingLeft:'14rpx'}"
:right-icon-style="{fontSize:'32rpx'}">
<template #title>
<view class="title-container" @click="navTo('/pages/Address/edit?detail='+JSON.stringify(item))">
<view class="title-container" @click="(type === 'select')?navBack(item):navTo('/pages/Address/edit?detail='+JSON.stringify(item))">
<view class="title-group row">
<view class="title">
<u-text :block="true" mode="name" :text="item.name" format="encrypt" size="32" color="#020b18"></u-text>
@ -45,7 +45,7 @@
size="35"
shape="circle"
iconSize="30"
@change="setAddrDefault(itme)"
@change="setAddrDefault(item)"
></u-checkbox>
</u-checkbox-group>
</view>
@ -113,9 +113,11 @@ export default {
size: {
height: 500,
},
type:''
}
},
onLoad() {
onLoad(option) {
this.type = option.type||''
this.getAddressList();
},
onReady() {
@ -167,6 +169,11 @@ export default {
url: url
})
},
navBack(item) {
item.select = true;
uni.setStorageSync('address',item)
wx.navigateBack(-1)
},
getAddressList(){
userAddrList().then(res => {
this.lists = res.data;

124
pages/Authentication/form.vue
Unescape View File

@ -19,10 +19,11 @@
</view>
<view class="fxx-content">
<u-form
errorType="toast"
labelPosition="left"
:model="model1"
:model="model"
:rules="rules"
ref="form1"
ref="authForm"
labelWidth="200rpx"
>
<u-form-item
@ -32,12 +33,11 @@
label="姓名"
prop="userInfo.name"
borderBottom
ref="item1"
>
<u-input
fontSize="28"
placeholder="请填写您的真实姓名"
v-model="model1.userInfo.name"
v-model="model.userInfo.name"
border="none"
></u-input>
</u-form-item>
@ -46,12 +46,11 @@
padding:'36rpx 0'
}"
label="姓别"
prop="userInfo.name"
prop="userInfo.sex"
borderBottom
ref="item1"
>
<u-radio-group
v-model="model1.userInfo.sex"
v-model="model.userInfo.sex"
placement="row"
@change="sexChange"
>
@ -74,14 +73,13 @@
padding:'36rpx 0'
}"
label="政治面貌"
prop="userInfo.name"
prop="userInfo.political_outlook "
borderBottom
ref="item1"
>
<u-input
fontSize="28"
placeholder="请选择"
v-model="model1.userInfo.name"
v-model="model.userInfo.political_outlook "
border="none"
></u-input>
</u-form-item>
@ -90,14 +88,13 @@
padding:'36rpx 0'
}"
label="手机号码"
prop="userInfo.name"
prop="userInfo.phone"
borderBottom
ref="item1"
>
<u-input
fontSize="28"
placeholder="请输入"
v-model="model1.userInfo.name"
v-model="model.userInfo.phone"
border="none"
></u-input>
</u-form-item>
@ -106,14 +103,13 @@
padding:'36rpx 0'
}"
label="所属街道"
prop="userInfo.name"
prop="userInfo.street"
borderBottom
ref="item1"
>
<u-input
fontSize="28"
placeholder="请选择"
v-model="model1.userInfo.name"
v-model="model.userInfo.street"
border="none"
></u-input>
</u-form-item>
@ -122,14 +118,13 @@
padding:'36rpx 0'
}"
label="所属社区"
prop="userInfo.name"
prop="userInfo.community"
borderBottom
ref="item1"
>
<u-input
fontSize="28"
placeholder="请选择"
v-model="model1.userInfo.name"
v-model="model.userInfo.community"
border="none"
></u-input>
</u-form-item>
@ -139,14 +134,13 @@
padding:'36rpx 0'
}"
label="公司全称"
prop="userInfo.name"
prop="userInfo.company"
borderBottom
ref="item1"
>
<u-input
fontSize="28"
placeholder="请输入"
v-model="model1.userInfo.name"
v-model="model.userInfo.company"
border="none"
></u-input>
</u-form-item>
@ -155,14 +149,13 @@
padding:'36rpx 0'
}"
label="职业分类"
prop="userInfo.name"
prop="userInfo.position_type"
borderBottom
ref="item1"
>
<u-input
fontSize="28"
placeholder="请选择"
v-model="model1.userInfo.name"
v-model="model.userInfo.position_type"
border="none"
></u-input>
</u-form-item>
@ -171,14 +164,13 @@
padding:'36rpx 0'
}"
label="身份证号码"
prop="userInfo.name"
prop="userInfo.id_card"
borderBottom
ref="item1"
>
<u-input
fontSize="28"
placeholder="请输入"
v-model="model1.userInfo.name"
v-model="model.userInfo.id_card"
border="none"
></u-input>
</u-form-item>
@ -199,6 +191,12 @@
></u-button>
</view>
</view>
<u-picker :show="polShow"
:columns="[polList]"
keyName="name"
@close="polShow = false"
@cancel="polShow = false"
@confirm="selectPol"></u-picker>
</template>
<script>
@ -214,10 +212,18 @@ export default {
},
data() {
return {
model1: {
polShow:false,
model: {
userInfo: {
name: '',
sex: 1,
phone: '',
company: '',
political_outlook: '',
street: '',
community: '',
id_card: '',
position_type: '',
},
},
rules: {
@ -234,6 +240,42 @@ export default {
message: '请选择男或女',
trigger: ['blur', 'change']
},
'userInfo.political_outlook ': {
type: 'string',
required: true,
message: '请选择政治面貌',
trigger: ['blur', 'change']
},
'userInfo.phone': {
type: 'string',
required: true,
message: '请输入手机号码',
trigger: ['blur', 'change']
},
'userInfo.street': {
type: 'string',
required: true,
message: '请选择街道',
trigger: ['blur', 'change']
},
'userInfo.community': {
type: 'string',
required: true,
message: '请选择社区',
trigger: ['blur', 'change']
},
'userInfo.id_card': {
type: 'string',
required: true,
message: '请输入身份证号',
trigger: ['blur', 'change']
},
'userInfo.position_type ': {
type: 'string',
required: true,
message: '请选择职业分类',
trigger: ['blur', 'change']
},
},
sexList:[
{
@ -247,6 +289,24 @@ export default {
disabled: false,
},
],
polList:[
{
id:0,
name: '群众',
},
{
id:1,
name: '共青团员',
},
{
id:2,
name: '预备党员',
},
{
id:3,
name: '党员',
},
],
list: [{
name: '最新资讯'
}, {
@ -341,13 +401,17 @@ export default {
},
sexChange(e){
this.model1.userInfo.sex = e;
this.model.userInfo.sex = e;
},
navTo(url) {
wx.navigateTo({
url: url
})
},
selectPol(e){
this.model.userInfo.political_outlook = e.value[0].id;
this.polShow = false;
}
},
onPageScroll(res) {
if (res.scrollTop <= 20) {

107
pages/Goods/index.vue
Unescape View File

@ -21,19 +21,19 @@
<u-text size="32" color="#FF9545" text="暖新币" custom-style="margin-right:10rpx;"></u-text>
</view>
<view class="price-item">
<u-text mode="price" size="48" color="#FF9545" :text="detail.price"></u-text>
<u-text mode="price" size="48" color="#FF9545" :text="detail.coin_number"></u-text>
</view>
</view>
<view class="street pad-26">
<u-text size="28" color="#AFB5BE" text="已兑换 50件"></u-text>
<u-text size="28" color="#AFB5BE" :text="'已兑换' +detail.sales_number+'件'"></u-text>
</view>
<view class="item-desc row pad-26">
<view class="item">
<view class="title">
<u-text align="left" size="36" color="#020B18"
text="新鲜鹿茸菇特级干货鹿茸菌云南特产煲汤脆姑蘑菇香菇48元500g包邮"></u-text>
:text="detail.name"></u-text>
</view>
</view>
</view>
@ -68,7 +68,7 @@
</view>
<view class="value">
<u-text align="left" size="28" color="#FF9545"
text="028-66668888"></u-text>
:text="detail.tel" @click="callPhone"></u-text>
</view>
</view>
</view>
@ -137,14 +137,7 @@
line
/>
<view class="detail-image">
<u-image mode="aspectFill" class="img" src="http://baidu.co/" height="500" width="100%"></u-image>
<u-image mode="aspectFill" class="img" src="http://baidu.co/" height="500" width="100%"></u-image>
<u-image mode="aspectFill" class="img" src="http://baidu.co/" height="500" width="100%"></u-image>
<u-image mode="aspectFill" class="img" src="http://baidu.co/" height="500" width="100%"></u-image>
<u-image mode="aspectFill" class="img" src="http://baidu.co/" height="500" width="100%"></u-image>
<u-image mode="aspectFill" class="img" src="http://baidu.co/" height="500" width="100%"></u-image>
<u-image mode="aspectFill" class="img" src="http://baidu.co/" height="500" width="100%"></u-image>
<u-image mode="aspectFill" class="img" src="http://baidu.co/" height="500" width="100%"></u-image>
<u-parse :content="detail.detail"></u-parse>
</view>
</view>
@ -161,7 +154,7 @@
<u-text size="32" color="#020B18" text="可用暖新币："></u-text>
</view>
<view class="desc-content">
<u-text size="32" color="#FF9545" text="3986"></u-text>
<u-text size="32" color="#FF9545" :text="userInfo.coin_number"></u-text>
</view>
<view class="desc-content">
<u-text size="32" color="#020B18" text="币"></u-text>
@ -169,7 +162,7 @@
</view>
<view class="button exchange">
<u-text size="32" color="#020B18" text="立即兑换" @click="exchangeShow = true"></u-text>
<u-text size="32" color="#020B18" text="立即兑换" @click="getSpecPop"></u-text>
</view>
</view>
</view>
@ -181,7 +174,7 @@
<u-text size="32" color="#FF9545" text="暖新币" lineHeight="32" custom-style="margin-right:10rpx;"></u-text>
</view>
<view class="price-item">
<u-text mode="price" size="48" color="#FF9545" lineHeight="48" :text="detail.price"></u-text>
<u-text mode="price" size="48" color="#FF9545" lineHeight="48" :text="(specificationsList[model.spec].coin_number*value)"></u-text>
</view>
<view class="price-item">
<u-text size="32" color="#FF9545" text="币" lineHeight="32" custom-style="margin-left:5rpx;"></u-text>
@ -190,7 +183,7 @@
</view>
<view class="street pad-26">
<u-text size="28" color="#AFB5BE" text="库存充足"></u-text>
<u-text size="28" color="#AFB5BE" :text="specificationsList[model.spec].quantity+'件'||'库存充足'"></u-text>
</view>
</view>
<view class="hr"></view>
@ -200,8 +193,9 @@
</view>
<view class="right col">
<view class="tags row">
<view class="tag" v-for="(item,index) in specificationsList" :class="{active:(index === specificationsCheck)}" @click="specificationsCheck = index">
{{ item }}</view>
<view class="tag" v-for="(item,index) in specificationsList" :class="{active:(index === model.spec)}" @click="model.spec = index">
{{ item.spec }}
</view>
</view>
</view>
</view>
@ -211,10 +205,10 @@
<u-text size="32" color="#AFB5BE" text="数量" custom-style="margin-right:10rpx;"></u-text>
</view>
<view class="right col">
<u-number-box inputWidth="60" buttonSize="60" v-model="value">
<u-number-box inputWidth="60" buttonSize="60" v-model="model.number">
<template #input>
<view class="number">
<u-input type="number" v-model="value" inputAlign="center" customStyle="width:60rpx;height:60rpx"></u-input>
<u-input type="number" v-model="model.number" inputAlign="center" customStyle="width:60rpx;height:60rpx"></u-input>
</view>
</template>
</u-number-box>
@ -243,7 +237,7 @@
<script>
import api from "@/utils/functions.js";
import {roomDetail} from "@/api/shop";
import {goodsDetail, goodsSpec, roomDetail} from "@/api/shop";
export default {
computed: {},
@ -254,30 +248,29 @@ export default {
size: {
height: 0
},
specificationsList:[
123,456,789,100
],
specificationsCheck:0,
specificationsList:[{
coin_number:0,
quantity:0,
spec:'',
id:'',
}],
exchangeShow:false,
value:1,
detail: {
id: '',
name:'',
images: '',
price: '',
street: '',
bedroom_number: '',
area: '',
toward: '',
year: '',
payment_cycle: '',
payment_type: '',
address: '',
coordinate: '',
rental_overview: '',
jiadian: '',
furniture: '',
coin_number: '',
sales_number: '',
tel: '',
}
detail: '',
},
userInfo:{},
model:{
number:1,
spec:0,
info:{}
},
}
},
onLoad(option) {
@ -287,16 +280,35 @@ export default {
this.size.height = api.navHeight().navigationBar + api.navHeight().systemBar
},
methods: {
callPhone(){
uni.makePhoneCall({
phoneNumber: this.detail.tel?.toString()
});
},
getDetail(id) {
roomDetail({
house_id: id
goodsDetail({
goods_id: id
}).then(res => {
console.log(res.data)
this.detail = res.data;
});
},
getSpec() {
goodsSpec({
goods_id: this.detail.id
}).then(res => {
this.specificationsList = res.data;
});
},
getSpecPop(){
this.exchangeShow = true;
this.getSpec();
},
submit(){
wx.navigateTo({url:'/pages/Order/confirm'})
this.model.info = this.specificationsList[this.model.spec];
this.model.info.name = this.detail.name;
this.model.info.image = this.detail.images[0];
wx.navigateTo({url:'/pages/Order/confirm?info='+JSON.stringify(this.model)})
},
},
onPageScroll(res) {
@ -306,7 +318,16 @@ export default {
},
mounted() {
this.userInfo = this.$store.userInfo
if(!this.userInfo){
this.userInfo = uni.getStorageSync('user');
}
console.log(this.userInfo)
if(this.userInfo){
this.model.order.name = this.userInfo.name;
this.model.order.id_card = this.userInfo.id_card;
this.model.order.phone = this.userInfo.phone;
}
},
}
</script>

2
pages/Index/components/HomePage/index.vue
Unescape View File

@ -218,7 +218,7 @@
flexWrap:'wrap',
marginBottom:'20rpx'
}">
<u-col :span="6" v-for="(item,index) in goodsList" :custom-style="{marginBottom:'20rpx'}">
<u-col :span="6" v-for="(item,index) in goodsList" :custom-style="{marginBottom:'20rpx'}" @click="navTo('/pages/Goods/index?id='+item.id)">
<MzCard
:title="item.name"
:ext="item.coin_number+'币'"

8
pages/Index/components/ShopPage/index.vue
Unescape View File

@ -199,7 +199,9 @@
<!-- <view>-->
<view v-for="(item, index) in list1Item"
:key="item.id"
class="waterfall-item">
class="waterfall-item"
@click="navTo('/pages/Goods/index?id='+item.id)"
>
<MzCard
:title="item.name"
:ext="item.coin_number+'币'"
@ -215,7 +217,9 @@
<!-- <view>-->
<view v-for="(item, index) in list2Item"
:key="item.id"
class="waterfall-item">
class="waterfall-item"
@click="navTo('/pages/Goods/index?id='+item.id)"
>
<view class="waterfall-item-image">
<u-image :src="item.cover" mode="widthFix" width="100%"></u-image>
</view>

8
pages/Index/components/UserPage/index.vue
Unescape View File

@ -198,6 +198,9 @@
</u-cell>
</u-cell-group>
<view class="button">
<u-button :custom-style="{border:'none'}" class="custom-style" size="small" radius="10" color="#FF9545" text="退出登录" @click="logout()"></u-button>
</view>
</view>
</template>
@ -288,6 +291,11 @@ export default {
},
updateUserInfo() {
},
logout(){
uni.setStorageSync('user',undefined);
uni.setStorageSync('token',undefined);
this.navTo('/pages/Index/index')
}
},
onPageScroll(res) {

4
pages/Line/components/ListPage/index.vue
Unescape View File

@ -37,8 +37,8 @@
<view class="content-img col-6" v-for="itemImg in item.images" v-if="item.images">
<u-image v-show="itemImg" :src="itemImg" :lazy-load="true" width="100%" height="180" mode="widthFix"></u-image>
</view>
<view class="content-img col-6" v-for="itemVideo in item.video" v-if="item.video">
<u-image v-show="itemVideo" :src="itemVideo" :lazy-load="true" width="100%" height="180" mode="widthFix"></u-image>
<view class="content-img col-6" v-if="item.video">
<u-image v-show="item.video" :src="item.video" :lazy-load="true" width="100%" height="180" mode="widthFix"></u-image>
</view>
</view>
</view>

37
pages/Line/components/SubmitPage/index.vue
Unescape View File

@ -66,7 +66,7 @@
<view class="label-title">文字说明</view>
<view class="tag-group row">
<view class="tag-container" v-for="(item,index) in tags">
<view class="tag-container" v-for="(item,index) in tags[0]">
<view class="tag border-box" :class="{checked:item.checked}" @click="checkboxClick(index)">
{{ item.name }}
</view>
@ -149,11 +149,13 @@
></u-button>
</view>
<u-picker :show="typeShow"
:columns="[tags]"
:columns="tags"
keyName="name"
@close="typeShow = false"
@cancel="typeShow = false"
@confirm="selectType"></u-picker>
@confirm="selectType"
@change="changeHandler"></u-picker>
</template>
<script>
@ -177,6 +179,7 @@ export default {
imageList: [],
videoList: [],
tags: [],
tagsData: [],
fileList1: [],
model: {
line: {
@ -307,13 +310,19 @@ export default {
//获取线索类型
getLineType(){
lineType({}).then((res) => {
this.tags = res.data;
this.tags[0] = res.data;
this.tagsData = [];
res.data.forEach(item => {
this.tagsData.push(item.children);
})
this.tags[1] = this.tagsData[0];
})
},
//选择线索类型
selectType(e){
this.model.line.clue_type_id = e.value[0].id;
this.type_name = e.value[0].name;
console.log(e)
this.model.line.clue_type_id = e.value[1].id;
this.type_name = e.value[1].name;
this.typeShow = false;
},
//上传图片
@ -424,7 +433,23 @@ export default {
console.log(this.model.line)
lineSubmit(this.model.line).then(res => {
uni.$u.toast('上传成功');
});
},
changeHandler(e){
const {
columnIndex,
value,
values,
index,
picker
} = e;
console.log(e)
if (columnIndex === 0) {
console.log(picker)
this.tags[1] = this.tagsData[index];
}
}
},
onPageScroll(res) {

31
pages/Login/index.vue
Unescape View File

@ -10,23 +10,23 @@
<view class="wallpaper-container row">
<view class="login-container row">
<!-- <u-button-->
<!-- type="success"-->
<!-- size="large"-->
<!-- @getphonenumber="wxLogin"-->
<!-- open-type="getPhoneNumber"-->
<!-- >-->
<!-- <u-icon name="weixin-circle-fill" size="50" color="#fff" class="weixin-icon"></u-icon>-->
<!-- 登录-->
<!-- </u-button>-->
<u-button
type="success"
size="large"
@click="login"
@getphonenumber="wxLogin"
open-type="getPhoneNumber"
>
<u-icon name="weixin-circle-fill" size="50" color="#fff" class="weixin-icon"></u-icon>
登录
</u-button>
<!-- <u-button-->
<!-- type="success"-->
<!-- size="large"-->
<!-- @click="login"-->
<!-- >-->
<!-- <u-icon name="weixin-circle-fill" size="50" color="#fff" class="weixin-icon"></u-icon>-->
<!-- 登录-->
<!-- </u-button>-->
</view>
</view>
</template>
@ -81,6 +81,17 @@ export default {
success: ((res) => {
appletLogin({
code:res.code
}).then(res => {
if(res.code === 200){
uni.setStorageSync('token',res.data.token);
uni.setStorageSync('user',res.data);
this.$store.commit('userInfo', res.data);
uni.navigateBack({
delta:1,
})
}else{
uni.$u.toast('登录失败');
}
})
})
});

46
pages/News/components/detail.scss
Unescape View File

@ -0,0 +1,46 @@
.body-background{
background:{
color:#F5F5F6;
}
}
.new-item {
background: {
color: #fff;
};
border-radius: 20rpx;
padding: 20rpx 16rpx;
margin-bottom: 16rpx;
.new-thumb {
width: 260rpx;
}
.new-icon {
width: 64rpx;
display: inline-block;
vertical-align: middle;
margin-right:-12rpx;
}
.new-title {
padding:{
left:20rpx;
}
font-size: 28rpx;
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #000000;
line-height: 42rpx;
text-align: justify;
}
.new-time{
margin-top:auto;
padding:{
left:20rpx;
}
font-size: 28rpx;
font-weight: 400;
color: #000000;
line-height: 1;
}
}

74
pages/News/detail.vue
Unescape View File

@ -0,0 +1,74 @@
<template>
<u-navbar
:title="title"
:auto-back="true"
left-icon-size="40rpx"
:safe-area-inset-top="true"
:placeholder="true"
bgColor="#ffffff"
></u-navbar>
<u-row :custom-style="{padding:'38rpx 66rpx'}">
<u-col :span="12">
<view class="content">
<u-parse :content="content"></u-parse>
</view>
</u-col>
</u-row>
</template>
<script>
import {
imghost
} from '@/config/host.js'
import MzSubsection from '@/components/MzSubsection/Index.vue';
import api from '@/utils/functions.js';
import {newDetail} from "@/api/other";
export default {
components: {
MzSubsection
},
data() {
return {
title: '资讯详情',
loading: true,
staticImage: {
bg: imghost + '/static/image/BG.png',
newIcon: imghost + '/static/image/new-icon.png',
},
isTop: false,
content:''
}
},
onLoad(option) {
this.getDetail(option.id);
},
computed: {
api() {
return api
},
},
methods: {
getDetail(id){
newDetail({id:id}).then(res => {
this.title = res.data.info.title;
this.content = res.data.info.content;
})
}
},
onPageScroll(res) {
if (res.scrollTop <= 20) {
uni.$emit('isTop', true);
} else {
uni.$emit('isTop', false);
}
},
created() {
}
}
</script>
<style lang="scss">
@import './components/detail.scss';
</style>

91
pages/News/index.vue
Unescape View File

@ -20,21 +20,23 @@
</view>
<u-row :custom-style="{padding:'0 26rpx'}">
<u-col>
<u-list
@scrolltolower="scrollToLower"
:height="(api.navHeight().windowHeight-size.height)+'px'"
:custom-style="{marginTop:'20rpx'}"
>
<!-- <u-list-->
<!-- @scrolltolower="scrollToLower"-->
<!-- :height="(api.navHeight().windowHeight-size.height)+'px'"-->
<!-- :custom-style="{marginTop:'20rpx'}"-->
<!-- >-->
<u-list-item
<view
style="margin-top:20rpx"
v-for="(item, index) in lists"
:key="index"
@click="navTo('/pages/News/detail?id='+item.id)"
>
<view class="new-item row">
<view class="new-thumb ">
<u-image
:show-loading="true"
:src="item.thumb"
:src="item.cover"
width="260"
height="160"
radius="10"
@ -52,12 +54,15 @@
/>
{{item.title}}
</view>
<view class="new-time">{{ item.time }}</view>
<view class="new-time">{{ item.create_time }}</view>
</view>
</view>
</u-list-item>
</u-list>
</view>
<!-- </u-list>-->
<u-loadmore :status="status" fontSize="28" marginBottom="30" marginTop="30" @loadmore="getList()"/>
</u-col>
</u-row>
</template>
@ -67,6 +72,8 @@ import {
} from '@/config/host.js'
import MzSubsection from '@/components/MzSubsection/Index.vue';
import api from '@/utils/functions.js';
import {roomList} from "@/api/shop";
import {newList} from "@/api/other";
export default {
components: {
@ -83,7 +90,7 @@ export default {
}],
// 或者如下，也可以配置keyName参数修改对象键名
// list: [{name: '未付款'}, {name: '待评价'}, {name: '已付款'}],
current: 1,
current: 0,
title: '资讯列表',
loading: true,
staticImage: {
@ -97,37 +104,22 @@ export default {
id: 88685,
},
isTop: false,
lists: [
{
id: 1,
thumb: imghost + '/static/image/new-1.png',
title: '全市公安机关夏季治安打击整治“彭安行动”新闻发布会召开',
desc: '需要您带一点猫砂上门，谢谢',
time: '2023/06/16',
is_new: true
}, {
id: 2,
thumb: imghost + '/static/image/new-2.png',
title: '全市公安机关夏季治安打击整治“彭安行动”新闻发布会召开',
desc: '需要您带一点猫砂上门，谢谢',
time: '2023/06/16',
is_new: true
}, {
id: 3,
thumb: imghost + '/static/image/new-3.png',
title: '全市公安机关夏季治安打击整治“彭安行动”111开',
desc: '需要您带一点猫砂上门，谢谢',
time: '2023/06/16',
is_new: false
},
],
lists: [],
size: {
height: 500,
}
},
pages:{
page:1,
limit:2,
},
status:'loadmore',
}
},
onLoad() {
},
mounted() {
this.getList();
},
computed: {
api() {
@ -154,6 +146,11 @@ export default {
}
},
methods: {
navTo(url) {
wx.navigateTo({
url: url
})
},
chatDetail(item) {
wx.navigateTo({
url: '/pages/ChatDetail/index?id=' + item.id
@ -161,10 +158,32 @@ export default {
},
checkSection(index) {
this.current = index;
this.pages.type = index+1;
this.getList(true);
},
scrollToLower() {
},
getList(clear){
if(clear){
this.status = 'loadmore'
this.pages.page = 1;
this.lists = [];
}
if(this.status === 'nomore'){
return false;
}
newList(this.pages).then(res => {
this.lists.push.apply(this.lists,res.data);
if(res.data.length === 0){
this.status = 'nomore'
}
})
this.pages.page++;
},
},
onReachBottom() {
this.getList();
},
onPageScroll(res) {
if (res.scrollTop <= 20) {

1
pages/Order/components/done.scss
Unescape View File

@ -2,6 +2,7 @@
background:{
color:#fff;
}
z-index:1;
align-items: center;
align-content: center;
.done-container{

108
pages/Order/confirm.vue
Unescape View File

@ -20,25 +20,25 @@
</view>
<view class="right row col">
<view class="content no-address">
<view class="title row col" v-if="true">
<view class="name">
<u-text text="张某某" color="#020B18" size="32" mode="name" lineHeight="50"></u-text>
</view>
<view class="phone">
<u-text text="15012345678" color="#020B18" size="32" mode="phone" lineHeight="50"></u-text>
</view>
</view>
<view class="title" v-else>
<u-text text="请选择收货地址" color="#020B18" size="32"></u-text>
<view class="title row col" v-if="address" @click="navTo('/pages/Address/index?type=select')">
<view class="name">
<u-text :text="address.name" color="#020B18" size="32" mode="name" lineHeight="50"></u-text>
</view>
<view class="desc">
<u-text text="四川省成都市双流区 海昌路168号" color="#AFB5BE" size="28"></u-text>
<view class="phone">
<u-text :text="address.phone" color="#020B18" size="32" mode="phone" lineHeight="50"></u-text>
</view>
</view>
<view class="title" v-else @click="navTo('/pages/Address/index?type=select')">
<u-text text="请选择收货地址" color="#020B18" size="32"></u-text>
</view>
<view class="desc" v-if="address">
<u-text :text="address.address" color="#AFB5BE" size="28"></u-text>
</view>
</view>
<view class="right-icon">
<u-icon name="arrow-right" size="32" color="#020B18"></u-icon>
</view>
<view class="right-icon">
<u-icon name="arrow-right" size="32" color="#020B18"></u-icon>
</view>
</view>
</view>
<view class="cell row order-info" :style="{height:size.height+'px'}">
@ -48,13 +48,14 @@
<view class="cell-body row col-12">
<view class="left">
<view class="icon">
<u-image mode="aspectFill" class="img" src="http://baidu.co/" height="180" width="180" radius="20"></u-image>
<u-image mode="aspectFill" class="img" src="http://baidu.co/" height="180" width="180"
radius="20"></u-image>
</view>
</view>
<view class="right row col">
<view class="content no-address row">
<view class="title row col" v-if="true">
<u-text text="新鲜鹿茸菇特级干货500g包邮" color="#020B18" size="32" lineHeight="42"></u-text>
<u-text :text="detail.info.name" color="#020B18" size="32" lineHeight="42"></u-text>
</view>
<view class="title" v-else>
<u-text text="请选择收货地址" color="#020B18" size="32"></u-text>
@ -65,7 +66,7 @@
<u-text text="规格" color="#AFB5BE" size="28"></u-text>
</view>
<view class="value">
<u-text text="5g" color="#AFB5BE" size="28"></u-text>
<u-text :text="detail.info.spec" color="#AFB5BE" size="28"></u-text>
</view>
</view>
<view class="item row">
@ -73,7 +74,7 @@
<u-text text="数量" color="#AFB5BE" size="28"></u-text>
</view>
<view class="value">
<u-text text="1件" color="#AFB5BE" size="28"></u-text>
<u-text :text="detail.number+'件'" color="#AFB5BE" size="28"></u-text>
</view>
</view>
@ -85,7 +86,8 @@
<view class="price-info-container row col-12">
<view class="label row col">
<view class="icon">
<u-image mode="aspectFill" class="img" src="http://baidu.co/" height="40" width="40" radius="20"></u-image>
<u-image mode="aspectFill" class="img" :src="detail.info.image.url" height="40" width="40"
radius="20"></u-image>
</view>
<view class="title">
<u-text text="全暖新币兑换" color="#020B18" size="28" lineHeight="28"></u-text>
@ -96,7 +98,7 @@
<u-text text="暖新币" color="#020B18" size="28" lineHeight="35" custom-style="margin-right:30rpx;"></u-text>
</view>
<view class="price">
<u-text text="300" color="#FF9545" size="48" lineHeight="48"></u-text>
<u-text :text="detail.info.coin_number * detail.number" color="#FF9545" size="48" lineHeight="48"></u-text>
</view>
<view class="price-label">
<u-text text="币" color="#FF9545" size="28" lineHeight="35"></u-text>
@ -127,6 +129,7 @@
import api from "@/utils/functions.js";
import {roomDetail} from "@/api/shop";
import {imghost} from "@/config/host";
import {submitGoodsOrder, userAddrList} from "@/api/user";
export default {
computed: {},
@ -137,14 +140,21 @@ export default {
size: {
height: 0
},
detail: {},
detail: {
number: 1,
spec: 0,
info: {}
},
address: {},
staticImage: {
bg: imghost + '/static/image/BG.png',
}
},
userInfo: {}
}
},
onLoad(option) {
this.getDetail(option.id)
this.detail = JSON.parse(option.info)
console.log(this.detail)
},
onReady() {
let that = this;
@ -167,6 +177,12 @@ export default {
});
},
methods: {
navTo(url) {
uni.navigateTo({
url: url
})
},
getDetail(id) {
roomDetail({
house_id: id
@ -176,16 +192,60 @@ export default {
});
},
submit() {
let data = {
spec_id:'',
address_id:'',
number:'',
};
data.spec_id = this.detail.info.id;
data.number = this.detail.number;
data.address_id = this.address.id;
submitGoodsOrder(data).then(res => {
if(res.code === 200){
this.navTo('/pages/Order/done?id='+res.data.goods_order_id);
}else{
uni.$u.toast(res.msg)
}
})
},
getDefaultAddress() {
let cacheAddress = uni.getStorageSync('address');
if (cacheAddress.select) {
this.address = cacheAddress;
} else {
userAddrList({}).then(res => {
res.data.forEach(item => {
if (item.is_default === 1) {
this.address = item;
}
});
})
}
}
},
onPageScroll(res) {
},
created() {
},
onShow() {
this.getDefaultAddress();
},
mounted() {
this.userInfo = this.$store.userInfo
if (!this.userInfo) {
this.userInfo = uni.getStorageSync('user');
}
console.log(this.userInfo)
if (this.userInfo) {
this.model.order.name = this.userInfo.name;
this.model.order.id_card = this.userInfo.id_card;
this.model.order.phone = this.userInfo.phone;
}
},
}
</script>

326
pages/Order/detail.vue
Unescape View File

@ -17,93 +17,102 @@
position:'relative'
}">
<u-form
errorType="toast"
labelWidth="auto"
labelPosition="left"
:model="model1"
:model="model"
:rules="rules"
ref="form1"
ref="orderForm"
>
<view class="form-title">
租房详情
</view>
<u-form-item
label="承租人"
prop="userInfo.sex"
prop="order.name"
borderBottom
ref="item1"
:custom-style="{padding:'34rpx 0',fontSize:'32rpx',color:'#020b18',fontWeight:'400',lineHeight:'50rpx'}"
>
<u-input
inputAlign="right"
disabledColor="#ffffff"
placeholder="请填写手机号，以便我们联系您"
placeholder="请输入"
border="none"
:custom-style="{paddingRight:'28rpx'}"
v-model="model.order.name"
></u-input>
</u-form-item>
<u-form-item
label="身份证号"
prop="userInfo.sex"
prop="order.id_card"
borderBottom
ref="item1"
:custom-style="{padding:'34rpx 0',fontSize:'32rpx',color:'#020b18',fontWeight:'400',lineHeight:'50rpx'}"
>
<u-input
inputAlign="right"
disabledColor="#ffffff"
placeholder="请填写手机号，以便我们联系您"
placeholder="请输入"
border="none"
:custom-style="{paddingRight:'28rpx'}"
v-model="model.order.id_card"
></u-input>
</u-form-item>
<u-form-item
label="联系方式"
prop="userInfo.sex"
prop="order.phone"
borderBottom
ref="item1"
:custom-style="{padding:'34rpx 0',fontSize:'32rpx',color:'#020b18',fontWeight:'400',lineHeight:'50rpx'}"
>
<u-input
inputAlign="right"
disabledColor="#ffffff"
placeholder="请填写手机号，以便我们联系您"
placeholder="请输入"
border="none"
:custom-style="{paddingRight:'28rpx'}"
v-model="model.order.phone"
></u-input>
</u-form-item>
<u-form-item
label="租期"
prop="userInfo.sex"
prop="order.month"
borderBottom
ref="item1"
:custom-style="{padding:'34rpx 0',fontSize:'32rpx',color:'#020b18',fontWeight:'400',lineHeight:'50rpx'}"
>
<u-input
inputAlign="right"
disabledColor="#ffffff"
placeholder="请填写手机号，以便我们联系您"
placeholder="请输入"
border="none"
type="number"
:custom-style="{paddingRight:'28rpx'}"
></u-input>
v-model="model.order.month"
>
<template #suffix>
<u-text text="个/月" color="#020B18" size="32"></u-text>
</template>
</u-input>
</u-form-item>
<u-form-item
label="租金"
prop="userInfo.sex"
prop="order.rent"
borderBottom
ref="item1"
:custom-style="{padding:'34rpx 0',fontSize:'32rpx',color:'#020b18',fontWeight:'400',lineHeight:'50rpx'}"
>
<u-input
inputAlign="right"
disabledColor="#ffffff"
placeholder="请填写手机号，以便我们联系您"
placeholder="请输入"
border="none"
:custom-style="{paddingRight:'28rpx'}"
></u-input>
v-model="model.order.rent"
>
<template #suffix>
<u-text text="元/月" color="#020B18" size="32"></u-text>
</template>
</u-input>
</u-form-item>
<u-form-item
prop="userInfo.sex"
ref="item1"
prop="order.payment_voucher"
:custom-style="{padding:'0 0',fontSize:'32rpx',color:'#020b18',fontWeight:'400',lineHeight:'50rpx'}"
>
<view class="form-label">
@ -117,11 +126,12 @@
multiple
:maxCount="10"
uploadIcon="plus"
@afterRead="afterFileRead1"
@delete="deleteFile1"
></u-upload>
</u-form-item>
<u-form-item
prop="userInfo.sex"
ref="item1"
prop="order.lease_agreement"
:custom-style="{padding:'0 0',fontSize:'32rpx',color:'#020b18',fontWeight:'400',lineHeight:'50rpx'}"
>
<view class="form-label no-top-pad">
@ -132,32 +142,22 @@
<u-upload
width="160"
height="160"
:fileList="fileList1"
name="1"
multiple
:maxCount="10"
uploadIcon="plus"
></u-upload>
</view>
<view class="">
<u-upload
width="160"
height="160"
:fileList="fileList1"
:fileList="fileList2"
name="1"
multiple
:maxCount="10"
uploadIcon="plus"
@afterRead="afterFileRead2"
@delete="deleteFile2"
></u-upload>
</view>
</view>
</u-form-item>
</u-form>
<view class="form-title m-t-46">
<view v-if="type !== 'create'" class="form-title m-t-46">
兑换详情
</view>
<view class="detail-container">
<view v-if="type !== 'create'" class="detail-container">
<view class="detail-item">
<u-cell-group
:border="false"
@ -198,6 +198,7 @@
fontWeight:'400',
height:'80rpx'
}"
@click="submit"
></u-button>
</view>
</template>
@ -208,6 +209,8 @@ import {
} from '@/config/host.js'
import MzSubsection from '@/components/MzSubsection/Index.vue';
import api from '@/utils/functions.js';
import {submitHouseOrder} from "@/api/user";
import {feedback} from "@/api/feed";
export default {
components: {
@ -215,93 +218,77 @@ export default {
},
data() {
return {
model1: {
userInfo: {
fileList1:[],
fileList2:[],
type:'create',
model: {
order: {
house_id: '',
name: '',
sex: 1,
id_card: '',
phone: '',
month: '',
rent: '',
payment_voucher: '',
lease_agreement: '',
},
},
rules: {
'userInfo.name': {
'order.name': {
type: 'string',
required: true,
message: '请填写姓名',
message: '请填写承租人',
trigger: ['blur', 'change']
},
'userInfo.sex': {
'order.id_card': {
type: 'string',
max: 1,
required: true,
message: '请选择男或女',
message: '请填写身份证号',
trigger: ['blur', 'change']
},
},
sexList:[
{
id:1,
name: '男',
disabled: false,
'order.phone': {
type: 'string',
required: true,
message: '请填写联系方式',
trigger: ['blur', 'change']
},
'order.month': {
type: 'string',
required: true,
message: '请填写租期',
trigger: ['blur', 'change']
},
'order.rent': {
type: 'string',
required: true,
message: '请填写租金',
trigger: ['blur', 'change']
},
'order.payment_voucher': {
type: 'array',
required: true,
message: '请上传打印凭证',
trigger: ['blur', 'change']
},
{
i:2,
name: '女',
disabled: false,
'order.lease_agreement': {
type: 'string',
required: true,
message: '请上传租赁协议',
trigger: ['blur', 'change']
},
],
list: [{
name: '最新资讯'
}, {
name: '表彰评优'
}, {
name: '活动回顾'
}],
// 或者如下，也可以配置keyName参数修改对象键名
// list: [{name: '未付款'}, {name: '待评价'}, {name: '已付款'}],
current: 1,
},
title: '租房详情',
loading: true,
staticImage: {
bg: imghost + '/static/image/BG.png',
newIcon: imghost + '/static/image/new-icon.png',
},
user: {
avatar: imghost + '/static/image/banner.png',
nickname: '清晨的风',
coupons: 221,
id: 88685,
},
isTop: false,
lists: [
{
id: 1,
thumb: imghost + '/static/image/new-1.png',
title: '全市公安机关夏季治安打击整治“彭安行动”新闻发布会召开',
desc: '需要您带一点猫砂上门，谢谢',
time: '2023/06/16',
is_new: true
}, {
id: 2,
thumb: imghost + '/static/image/new-2.png',
title: '全市公安机关夏季治安打击整治“彭安行动”新闻发布会召开',
desc: '需要您带一点猫砂上门，谢谢',
time: '2023/06/16',
is_new: true
}, {
id: 3,
thumb: imghost + '/static/image/new-3.png',
title: '全市公安机关夏季治安打击整治“彭安行动”111开',
desc: '需要您带一点猫砂上门，谢谢',
time: '2023/06/16',
is_new: false
},
],
size: {
height: 500,
}
}
},
onLoad() {
onLoad(option) {
this.model.order.house_id = option.id?option.id:'';
this.model.order.rent = option.rent?option.rent:'';
this.type = option.type?option.type:'create';
console.log(option)
},
onReady() {
let that = this;
@ -311,58 +298,113 @@ export default {
let info = uni.createSelectorQuery().in(this).select('.foot-button');
info.boundingClientRect(function (data) {
that.size.height = that.size.height = height - headerHeight - data.height - uni.$u.getPx('32rpx');
}).exec(function (res) {
});
}).exec(function (res) {});
},
computed: {
api() {
return api
},
sectionStyle() {
const style = {};
style.padding = '0 26rpx';
style.position = 'sticky';
style.zIndex = '9999';
style.top = api.navHeight().systemBarHeight + 'px'
return style;
computed: {},
methods: {
submit(){
let file1 = [];
this.fileList1.forEach(item => {
file1.push(item.url)
});
this.model.order.payment_voucher = file1;
let file2 = [];
this.fileList2.forEach(item => {
file2.push(item.url)
});
this.model.order.lease_agreement = file2.join();
console.log(this.model.order)
this.$refs.orderForm.validate().then(res => {
submitHouseOrder(this.model.order).then(res => {
if(res === '200'){
uni.$u.toast('反馈成功')
}else{
uni.$u.toast(res.msg)
}
})
}).catch(errors => {
uni.$u.toast(errors[0].message)
})
},
listHeight() {
let that = this;
let height;
let info = uni.createSelectorQuery().in(this).select('.subsection');
info.boundingClientRect(function (data) {
that.size.height = data.height;
}).exec(function (res) {
//上传文件
async afterFileRead1 (event){
let lists = [].concat(event.file);
let fileListLen = this.fileList1.length;
lists.map((item) => {
this.fileList1.push({
...item,
status: 'uploading',
message: '上传中',
});
});
// that.size.height = (api.navHeight().windowHeight - height);
}
},
methods: {
chatDetail(item) {
wx.navigateTo({
url: '/pages/ChatDetail/index?id=' + item.id
for (let i = 0; i < lists.length; i++) {
api.upfile(lists[i].url).then(res => {
let item = this.fileList1[fileListLen];
this.fileList1.splice(fileListLen, 1, {
...item,
status: 'success',
message: '',
url: res.show_path,
thumb: res.show_path,
});
fileListLen++;
})
}
},
//上传文件
async afterFileRead2 (event){
let lists = [].concat(event.file);
let fileListLen = this.fileList2.length;
lists.map((item) => {
this.fileList2.push({
...item,
status: 'uploading',
message: '上传中',
});
});
for (let i = 0; i < lists.length; i++) {
api.upfile(lists[i].url).then(res => {
let item = this.fileList2[fileListLen];
this.fileList2.splice(fileListLen, 1, {
...item,
status: 'success',
message: '',
url: res.show_path,
thumb: res.show_path,
});
fileListLen++;
})
}
},
checkSection(index) {
this.current = edit;
//删除上传图片
deleteFile1(event){
this.fileList1.splice(event.index, 1);
},
scrollToLower() {
//删除上传图片
deleteFile2(event){
this.fileList2.splice(event.index, 1);
},
},
onPageScroll(res) {
if (res.scrollTop <= 20) {
uni.$emit('isTop', true);
} else {
uni.$emit('isTop', false);
}
},
created() {
this.listHeight();
// this.pagePadding = (api.navHeight().navPaddingTop +
// api.navHeight().navHeight + (api.navHeight().headerPadding * 2))
},
mounted() {
this.userInfo = uni.getStorageSync('user');
// this.userInfo = this.$store.userInfo
if(this.userInfo && this.type!=='create'){
this.model.order.name = this.userInfo.name;
this.model.order.id_card = this.userInfo.id_card;
this.model.order.phone = this.userInfo.phone;
}
}
}
</script>

11
pages/Order/done.vue
Unescape View File

@ -21,8 +21,9 @@
</view>
<view class="button col-12 row">
<u-button
@click="goHome"
type="primary"
text="订单详情"
text="返回首页"
shape="circle"
:custom-style="{
color:'#020B18',
@ -33,7 +34,6 @@
height:'80rpx',
width:'360rpx'
}"
@click="submit"
></u-button>
</view>
</view>
@ -77,7 +77,7 @@ export default {
}
},
onLoad(option) {
this.getDetail(option.id)
// this.getDetail(option.id)
},
onReady() {
let that = this;
@ -108,6 +108,11 @@ export default {
this.detail = res.data;
});
},
goHome(){
wx.reLaunch({
url: '/pages/Index/index'
});
},
submit() {
},
},

6
pages/Room/components/index.scss
Unescape View File

@ -92,6 +92,12 @@
.body{
padding:50rpx 14rpx;
.item{
.sub-title{
margin:46rpx 0;
&:first-child{
margin-top: 0;
}
}
.check-item{
margin-bottom:32rpx;
}

91
pages/Room/index.vue
Unescape View File

@ -58,14 +58,14 @@
<view class="tags row pad-26">
<view class="tag">{{detail.payment_cycle}}</view>
<view class="tag">{{detail.payment_type}}</view>
<view class="tag" v-for="tag in detail.rental_overview">
{{ tag }}
<view class="tag" v-for="tag in detail.rental_overview" v-show="tag.is_have">
{{ tag.text }}
</view>
</view>
<view class="hr"></view>
<view class="address row pad-26">
<u-text size="32" color="#020B18" :text="detail.address"></u-text>
<view class="address-btn">
<view class="address-btn" @click="callLocation">
<u-icon name="map" size="45" color="#ffffff"></u-icon>
</view>
</view>
@ -79,21 +79,9 @@
</view>
<view class="body">
<view class="item row">
<view class="check-item row col-6">
<u-icon name="checkmark" size="40" color="#FF9545" custom-style="margin-right:20rpx;"></u-icon>
<u-text size="28" color="#020B18" text="电梯"></u-text>
</view>
<view class="check-item row col-6">
<u-icon name="checkmark" size="40" color="#AFB5BE" custom-style="margin-right:20rpx;"></u-icon>
<u-text size="28" color="#020B18" text="电梯"></u-text>
</view>
<view class="check-item row col-6">
<u-icon name="checkmark" size="40" color="#FF9545" custom-style="margin-right:20rpx;"></u-icon>
<u-text size="28" color="#020B18" text="电梯"></u-text>
</view>
<view class="check-item row col-6">
<u-icon name="checkmark" size="40" color="#AFB5BE" custom-style="margin-right:20rpx;"></u-icon>
<u-text size="28" color="#020B18" text="电梯"></u-text>
<view class="check-item row col-6" v-for="item in detail.rental_overview">
<u-icon name="checkmark" size="40" :color="item.is_have?'#FF9545':'#AFB5BE'" custom-style="margin-right:20rpx;"></u-icon>
<u-text size="28" color="#020B18" :text="item.text"></u-text>
</view>
</view>
</view>
@ -107,21 +95,16 @@
</view>
<view class="body">
<view class="item row">
<view class="check-item row col-6">
<u-icon name="checkmark" size="40" color="#FF9545" custom-style="margin-right:20rpx;"></u-icon>
<u-text size="28" color="#020B18" text="电梯"></u-text>
</view>
<view class="check-item row col-6">
<u-icon name="checkmark" size="40" color="#AFB5BE" custom-style="margin-right:20rpx;"></u-icon>
<u-text size="28" color="#020B18" text="电梯"></u-text>
</view>
<view class="check-item row col-6">
<u-icon name="checkmark" size="40" color="#FF9545" custom-style="margin-right:20rpx;"></u-icon>
<u-text size="28" color="#020B18" text="电梯"></u-text>
<view class="sub-title col-12">家具情况</view>
<view class="check-item row col-6" v-for="item in detail.furniture">
<u-icon name="checkmark" size="40" :color="item.is_have?'#FF9545':'#AFB5BE'" custom-style="margin-right:20rpx;"></u-icon>
<u-text size="28" color="#020B18" :text="item.text"></u-text>
</view>
<view class="check-item row col-6">
<u-icon name="checkmark" size="40" color="#AFB5BE" custom-style="margin-right:20rpx;"></u-icon>
<u-text size="28" color="#020B18" text="电梯"></u-text>
<view class="sub-title col-12">家电情况</view>
<view class="check-item row col-6" v-for="item in detail.jiadian">
<u-icon name="checkmark" size="40" :color="item.is_have?'#FF9545':'#AFB5BE'" custom-style="margin-right:20rpx;"></u-icon>
<u-text size="28" color="#020B18" :text="item.text"></u-text>
</view>
</view>
</view>
@ -136,10 +119,10 @@
<view class="button-group">
<view class="button phone ">
<u-icon name="phone-fill" size="32" color="#000" custom-style="margin-right:10rpx;"></u-icon>
<u-text size="32" color="#020B18" text="电话联系"></u-text>
<u-text size="32" color="#020B18" text="电话联系" @click="callPhone"></u-text>
</view>
<view class="button exchange">
<u-text size="32" color="#020B18" text="暖新币兑换"></u-text>
<u-text size="32" color="#020B18" text="暖新币兑换" @click="navTo('/pages/Order/detail?type=create&id='+detail.id+'&rent='+detail.price)"></u-text>
</view>
</view>
</view>
@ -148,6 +131,7 @@
<script>
import api from "@/utils/functions.js";
import {roomDetail} from "@/api/shop";
import {systemConfig} from "@/api/other";
export default {
computed: {
@ -179,6 +163,11 @@
jiadian:'',
furniture:'',
tel:'',
},
all:{
rental_overview:[],
furniture:[],
jiadian:[],
}
}
},
@ -189,14 +178,42 @@
this.size.height = api.navHeight().navigationBar + api.navHeight().systemBar
},
methods: {
navTo(url) {
wx.navigateTo({
url: url
})
},
getDetail(id){
roomDetail({
house_id:id
}).then(res => {
console.log(res.data)
res.data.coordinate = res.data.coordinate.split(',')
this.detail = res.data;
});
}
},
getInfo(){
systemConfig({type:'rental_overview'}).then(res => {
this.all.rental_overview = res.data;
});
systemConfig({type:'furniture'}).then(res => {
this.all.furniture = res.data;
});
systemConfig({type:'jiadian'}).then(res => {
this.all.jiadian = res.data;
});
},
callPhone(){
uni.makePhoneCall({
phoneNumber: this.detail.tel?.toString()
});
},
callLocation(){
uni.openLocation({
latitude:parseFloat(this.detail.coordinate[0]),
longitude:parseFloat(this.detail.coordinate[1]),
name:this.detail.address,
})
},
},
onPageScroll(res) {
@ -205,7 +222,7 @@
},
mounted() {
this.getInfo();
},
}
</script>

90
pages/Street/index.vue
Unescape View File

@ -11,7 +11,7 @@
<view class="street-container">
<view class="item" v-for="(item,index) in lists">
<view class="title-container">
<view class="title">{{ item.title }}</view>
<view class="title">{{ item.name }}</view>
</view>
<view class="address-container">
@ -34,14 +34,16 @@
<u-icon :name="staticImage.phone"></u-icon>
</view>
<view class="phone">
{{ item.phone }}
{{ item.tel }}
</view>
</view>
<view class="button">
<u-button :custom-style="{border:'none'}" class="custom-style" size="small" radius="10" color="#FF9545" text="一键拨号" @click="callPhone(item.phone)"></u-button>
<u-button :custom-style="{border:'none'}" class="custom-style" size="small" radius="10" color="#FF9545" text="一键拨号" @click="callPhone(item.tel)"></u-button>
</view>
</view>
</view>
<u-loadmore :status="status" fontSize="28" marginBottom="50" marginTop="30" @loadmore="getStreetPhoneList()"/>
</view>
</template>
@ -51,6 +53,9 @@ import {
} from '@/config/host.js'
import MzSubsection from '@/components/MzSubsection/Index.vue';
import api from '@/utils/functions.js';
import {streetCallList} from "@/api/other";
import {lineList} from "@/api/line";
import {userLineList} from "@/api/user";
export default {
components: {
@ -83,37 +88,15 @@ export default {
id: 88685,
},
isTop: false,
lists: [
{
id: 1,
thumb: imghost + '/static/image/new-1.png',
title: '全市公安机关夏季治安打击整治“彭安行动”新闻发布会召开',
desc: '全市公安机关夏季治安打击整治',
time: '2023/06/16',
address: '大丰街道',
phone:15012345678,
lat:30.616079,
lng:104.078127,
is_new: true
}, {
id: 2,
thumb: imghost + '/static/image/new-2.png',
title: '全市公安机关夏季治安打击整治“彭安行动”新闻发布会召开',
desc: '需要您带一点猫砂上门，谢谢',
time: '2023/06/16',
is_new: true
}, {
id: 3,
thumb: imghost + '/static/image/new-3.png',
title: '全市公安机关夏季治安打击整治“彭安行动”111开',
desc: '需要您带一点猫砂上门，谢谢',
time: '2023/06/16',
is_new: false
},
],
lists: [],
pages:{
page:1,
limit:10,
},
size: {
height: 500,
}
},
status:'loadmore',
}
},
onLoad() {
@ -146,13 +129,13 @@ export default {
methods: {
callPhone(phone){
uni.makePhoneCall({
phoneNumber: phone.toString()
phoneNumber: phone?.toString()
});
},
callLocation(item){
uni.openLocation({
latitude:parseFloat(item.lat),
longitude:parseFloat(item.lng),
latitude:parseFloat(item.coordinate[0]),
longitude:parseFloat(item.coordinate[1]),
name:item.address,
})
},
@ -167,6 +150,33 @@ export default {
scrollToLower() {
},
getStreetPhoneList(clear = false) {
if(clear){
this.status = 'loadmore'
this.pages.page = 1;
this.pages.limit = 10;
this.lists = [];
}
if(this.status === 'nomore'){
return false;
}
this.status = 'loading';
streetCallList(this.pages).then(res => {
if(res.data.length === 0){
this.status = 'nomore';
}else{
this.status = 'loadmore';
}
this.lists.push.apply(this.lists,res.data.map(item => {
item.coordinate = item.coordinate.split(',')
return item;
}))
}).catch(err => {
this.status = 'loadmore';
})
this.pages.page++;
},
},
onPageScroll(res) {
if (res.scrollTop <= 20) {
@ -179,7 +189,15 @@ export default {
// this.listHeight();
// this.pagePadding = (api.navHeight().navPaddingTop +
// api.navHeight().navHeight + (api.navHeight().headerPadding * 2))
}
},
mounted() {
this.getStreetPhoneList();
},
onReachBottom(){
console.log('bottom')
this.getStreetPhoneList();
},
}
</script>

9
pages/User/components/order.scss
Unescape View File

@ -40,6 +40,9 @@
&.blue{
color: #178AF2;
}
&.red{
color: darkred;
}
}
}
.item-body{
@ -100,6 +103,12 @@
.info-left{
max-width:100%;
}
.info-ext{
justify-content: space-between;
.label{
color:#AFB5BE;
}
}
}
}
}

338
pages/User/order.vue
Unescape View File

@ -48,113 +48,29 @@
@change="tabsScChange"
></u-tabs>
</view>
<view class="lists-container row">
<view class="item">
<view class="item-header row">
<view class="title">2023-08-03</view>
<view class="status green">已完成</view>
</view>
<view class="item-body row">
<view class="body-main row">
<view class="thumb">
<u-image :src="staticImage.shopThumb" :lazy-load="true" radius="24" width="176" height="176" mode="aspectFill"></u-image>
</view>
<view class="info row col">
<view class="info-left">
<view class="info-title">美迪惠尔水润保湿面膜10片水库针剂</view>
</view>
<view class="info-right">
<view class="info-price">￥369.00</view>
<view class="info-number">x2</view>
</view>
<view class="info-ext row">
<view class="label">暖新币</view>
<view class="price">369币</view>
</view>
</view>
</view>
</view>
<view class="item-footer row">
<view class="phone">
<view class="phone-button" @click="callPhone('15012345678')">
<u-icon name="phone-fill" size="45" color="#ffffff"></u-icon>
</view>
</view>
<view class="button-group row col">
<view class="button">
<u-button text="查看详情" shape="circle" custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>
</view>
<view class="button">
<u-button text="查看物流" shape="circle" custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>
</view>
</view>
</view>
</view>
<view class="item">
<view class="item-header row">
<view class="title">2023-08-03</view>
<view class="status orange">待发货</view>
</view>
<view class="item-body row">
<view class="body-main row">
<view class="thumb">
<u-image :src="staticImage.shopThumb" :lazy-load="true" radius="24" width="176" height="176" mode="aspectFill"></u-image>
</view>
<view class="info row col">
<view class="info-left">
<view class="info-title">美迪惠尔水润保湿面膜10片水库针剂</view>
</view>
<view class="info-right">
<view class="info-price">￥369.00</view>
<view class="info-number">x2</view>
</view>
<view class="info-ext row">
<view class="label">暖新币</view>
<view class="price">369币</view>
</view>
</view>
</view>
</view>
<view class="item-footer row">
<view class="phone">
<view class="phone-button" @click="callPhone('15012345678')">
<u-icon name="phone-fill" size="45" color="#ffffff"></u-icon>
</view>
</view>
<view class="button-group row col">
<view class="button">
<u-button text="查看详情" shape="circle" custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>
</view>
<view class="button">
<u-button text="查看物流" shape="circle" custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>
</view>
</view>
</view>
</view>
<view class="item">
<view class="lists-group row">
<view class="lists-container row" v-if="tabCheck === 'shop'">
<view class="item" v-for="(item,index) in listsSc">
<view class="item-header row">
<view class="title">2023-08-03</view>
<view class="status blue">待收货</view>
<view class="title">{{ item.create_time }}</view>
<view class="status" :class="getScStatus(item.status).color">{{getScStatus(item.status).name}}</view>
</view>
<view class="item-body row">
<view class="body-main row">
<view class="thumb">
<u-image :src="staticImage.shopThumb" :lazy-load="true" radius="24" width="176" height="176" mode="aspectFill"></u-image>
<u-image :src="item.goods_cover" :lazy-load="true" radius="24" width="176" height="176" mode="aspectFill"></u-image>
</view>
<view class="info row col">
<view class="info-left">
<view class="info-title">美迪惠尔水润保湿面膜10片水库针剂</view>
<view class="info-title">{{item.goods_name}}</view>
</view>
<view class="info-right">
<view class="info-price">￥369.00</view>
<view class="info-number">x2</view>
<view class="info-price">￥{{item.coin_number}}</view>
<view class="info-number">x{{item.goods_number}}</view>
</view>
<view class="info-ext row">
<view class="label">暖新币</view>
<view class="price">369币</view>
<view class="price">{{item.coin_number}}币</view>
</view>
</view>
</view>
@ -162,7 +78,7 @@
</view>
<view class="item-footer row">
<view class="phone">
<view class="phone-button" @click="callPhone('15012345678')">
<view class="phone-button" @click="callPhone(item.take_phone)">
<u-icon name="phone-fill" size="45" color="#ffffff"></u-icon>
</view>
</view>
@ -176,24 +92,26 @@
</view>
</view>
</view>
<view class="item">
</view>
<view class="lists-container row" v-if="tabCheck === 'room'">
<view class="item" v-for="(item,index) in listsGy">
<view class="item-header row">
<view class="title">2023-08-03</view>
<view class="status blue">待收货</view>
<view class="title">{{item.create_time}}</view>
<view class="status" :class="getGyStatus(item.status).color">{{getGyStatus(item.status).name}}</view>
</view>
<view class="item-body room row">
<view class="body-main row">
<view class="thumb">
<u-image :src="staticImage.shopThumb" :lazy-load="true" radius="24" width="176" height="176" mode="aspectFill"></u-image>
<u-image :src="item.cover" :lazy-load="true" radius="24" width="176" height="176" mode="aspectFill"></u-image>
</view>
<view class="info row col">
<view class="info-left">
<view class="info-title">合租 北新润苑二期4居室 南卧</view>
<view class="info-desc">桂溪街道 50㎡ | 朝南</view>
<view class="info-title">{{item.name}}</view>
<view class="info-desc">{{ item.street }} {{ item.area }}㎡ | 朝{{item.toward}}</view>
</view>
<view class="info-ext row">
<view class="label">暖新币</view>
<view class="price">369币</view>
<view class="label">租期{{item.month}}个月</view>
<view class="price">{{item.price}}元/月</view>
</view>
</view>
</view>
@ -205,15 +123,26 @@
</view>
<view class="button-group row col">
<view class="button">
<u-button text="查看详情" shape="circle" custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>
<u-button
@click="navTo('/pages/Order/detail?id='+item.id+'&type=detail')"
text="租房详情"
shape="circle"
custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>
</view>
<view class="button">
<u-button text="查看物流" shape="circle" custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>
<u-button text="兑换详情" shape="circle" custom-style="height:64rpx;border: 2rpx solid #AFB5BE;padding:0rpx 42rpx;"></u-button>
<!-- <u-button text="我要兑换" shape="circle" custom-style="height:64rpx;border: 2rpx solid #FF9545;padding:0rpx 42rpx; color:#FF9545;"></u-button>-->
</view>
</view>
</view>
</view>
</view>
<u-loadmore v-if="(tabCheck==='room')" :status="statusGy" fontSize="28" marginBottom="50" marginTop="30" @loadmore="getRoomOrderList()"/>
<u-loadmore v-if="(tabCheck==='shop')" :status="statusSc" fontSize="28" marginBottom="50" marginTop="30" @loadmore="getGoodsOrderList()"/>
</view>
</template>
@ -223,6 +152,7 @@ import {
} from '@/config/host.js'
import MzSubsection from '@/components/MzSubsection/Index.vue';
import api from '@/utils/functions.js';
import {goodsOrder, roomOrder, tabCount} from "@/api/user";
export default {
components: {
@ -238,37 +168,34 @@ export default {
id:'shop'
}],
listGy: [{
name: '全部'
name: '全部',
status:''
}, {
name: '租赁中',
badge: {
value: 2,
bgColor:'#FF9545',
color:'#3D3D3D'
}
status:2,
}, {
name: '已完成'
name: '已完成',
status:4
}],
listSc: [{
name: '全部'
name: '全部',
status:''
}, {
name: '待发货',
badge: {
value: 5,
bgColor:'#FF9545',
color:'#3D3D3D',
}
status:1,
}, {
name: '待收货'
name: '待收货',
status:2,
}, {
name: '已完成'
name: '已完成',
status:3
}],
tabCheck:'room',
tabGyCheck:'all',
tabScCheck:'all',
tabGyCheck:'',
tabScCheck:'',
current: 1,
title: '编辑资料',
title: '我的订单',
loading: true,
staticImage: {
bg: imghost + '/static/image/BG.png',
@ -282,33 +209,21 @@ export default {
id: 88685,
},
isTop: false,
lists: [
{
id: 1,
thumb: imghost + '/static/image/new-1.png',
title: '全市公安机关夏季治安打击整治“彭安行动”新闻发布会召开',
desc: '需要您带一点猫砂上门，谢谢',
time: '2023/06/16',
is_new: true
}, {
id: 2,
thumb: imghost + '/static/image/new-2.png',
title: '全市公安机关夏季治安打击整治“彭安行动”新闻发布会召开',
desc: '需要您带一点猫砂上门，谢谢',
time: '2023/06/16',
is_new: true
}, {
id: 3,
thumb: imghost + '/static/image/new-3.png',
title: '全市公安机关夏季治安打击整治“彭安行动”111开',
desc: '需要您带一点猫砂上门，谢谢',
time: '2023/06/16',
is_new: false
},
],
listsGy: [],
listsSc: [],
size: {
height: 500,
}
},
pagesGy:{
page:1,
limit:10,
},
statusGy:'loadmore',
pagesSc:{
page:1,
limit:10,
},
statusSc:'loadmore'
}
},
onLoad() {
@ -340,6 +255,28 @@ export default {
},
},
methods: {
getGyStatus(status){
switch(status){
case 1:
return {name:'待审核',color:'orange'}
case 2:
return {name:'租赁中',color:'blue'}
case 3:
return {name:'审核失败',color:'red'}
case 4:
return {name:'已完成',color:'green'}
}
},
getScStatus(status){
switch(status){
case 1:
return {name:'待发货',color:'orange'}
case 2:
return {name:'待收货',color:'blue'}
case 3:
return {name:'已完成',color:'green'}
}
},
chatDetail(item) {
wx.navigateTo({
url: '/pages/ChatDetail/index?id=' + item.id
@ -355,15 +292,111 @@ export default {
this.tabCheck = e.id
},
tabsGyChange(e){
this.tabGyCheck = e.id
this.tabGyCheck = e.status
this.getRoomOrderList(true);
},
tabsScChange(e){
this.tabScCheck = e.id
this.tabScCheck = e.status
this.getGoodsOrderList(true);
},
callPhone(phone){
uni.makePhoneCall({
phoneNumber: phone.toString()
});
},
getRoomOrderList(clear = false){
if(clear){
this.statusGy = 'loadmore'
this.pagesGy = {
page:1,
limit:10
}
this.listsGy = [];
}
if(this.statusGy === 'nomore'){
return false;
}
this.statusGy = 'loading';
let data = this.pagesGy;
if(this.tabGyCheck){
data.status = this.tabGyCheck;
}
roomOrder(data).then(res => {
if(res.data.length === 0){
this.statusGy = 'nomore';
}else{
this.statusGy = 'loadmore';
}
this.listsGy = this.listsGy.concat(res.data);
});
this.pagesGy.page++;
},
getGoodsOrderList(clear = false){
if(clear){
this.statusSc = 'loadmore'
this.pagesSc = {
page:1,
limit:10
}
this.listsSc = [];
}
if(this.statusSc === 'nomore'){
return false;
}
this.statusSc = 'loading';
let data = this.pagesSc;
if(this.tabScCheck){
data.status = this.tabScCheck;
}
goodsOrder(data).then(res => {
if(res.data.length === 0){
this.statusSc = 'nomore';
}else{
this.statusSc = 'loadmore';
}
this.listsSc = this.listsSc.concat(res.data);
});
this.pagesSc.page++;
},
getTabCount(){
tabCount({type:'house'}).then(res => {
this.listGy.forEach(item => {
res.data.forEach(row => {
if(item.status === row.type){
item.badge = {
bgColor:'#FF9545',
color:'#3D3D3D',
}
item.badge.value = row.count;
}
})
})
})
tabCount({type:'goods'}).then(res => {
this.listSc.forEach(item => {
res.data.forEach(row => {
if(item.status === row.type){
item.badge = {
bgColor:'#FF9545',
color:'#3D3D3D',
}
item.badge.value = row.count;
}
})
})
})
},
navTo(url){
wx.navigateTo({
url:url
})
},
},
onReachBottom() {
if(this.tabCheck === 'room'){
this.getRoomOrderList();
}else{
this.getGoodsOrderList();
}
},
onPageScroll(res) {
@ -373,6 +406,11 @@ export default {
uni.$emit('isTop', false);
}
},
mounted() {
this.getRoomOrderList();
this.getGoodsOrderList();
this.getTabCount();
},
created() {
// this.pagePadding = (api.navHeight().navPaddingTop +
// api.navHeight().navHeight + (api.navHeight().headerPadding * 2))

2
project.config.json
Unescape View File

@ -25,5 +25,5 @@
"ignore": [],
"include": []
},
"appid": "wxe20096a48806d438"
"appid": "wxf8a4f883afcaefa9"
}
Write Preview
Loading…
Cancel
Save