|
@@ -53,22 +53,14 @@
|
|
|
<!-- <u-button @click="submit" :loading="loading" :custom-style="submitBtn" :disabled="!hasRider">提交</u-button> -->
|
|
|
<u-button @click="submit" :loading="loading" :custom-style="submitBtn">提交</u-button>
|
|
|
</view>
|
|
|
- <!-- <uni-popup ref="openModal" type="center">
|
|
|
- <uni-popup-dialog content="确认提交吗?" @confirm="onOk" :title="title"></uni-popup-dialog>
|
|
|
- </uni-popup> -->
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
- // import uniPopup from '@/components/uni-popup/uni-popup.vue'
|
|
|
- // import uniPopupDialog from '@/components/uni-popup/uni-popup-dialog.vue'
|
|
|
import {searchRider} from '@/api/index.js'
|
|
|
import {saveImgToAliOss} from '@/libs/tools.js'
|
|
|
import { getLookUpDatas,userDetail,yuyueInfoSave } from '@/api/data'
|
|
|
export default {
|
|
|
- // components: {
|
|
|
- // uniPopup,uniPopupDialog
|
|
|
- // },
|
|
|
data() {
|
|
|
return {
|
|
|
title:'',
|
|
@@ -102,6 +94,7 @@
|
|
|
borderRadius: '12px'
|
|
|
},
|
|
|
show: false,
|
|
|
+ val:'',
|
|
|
list: [
|
|
|
{
|
|
|
value: 1,
|
|
@@ -149,8 +142,12 @@
|
|
|
};
|
|
|
},
|
|
|
onLoad(option) {
|
|
|
- console.log(option,option.id,'ppppppppp')
|
|
|
- this.pageInfo()
|
|
|
+ console.log(option,option.pageType,'ppppppppp')
|
|
|
+ // if(!option.pageType){
|
|
|
+ // this.pageInfo()
|
|
|
+ // }
|
|
|
+ uni.$on('pageType', this.pageType)
|
|
|
+
|
|
|
// 查看
|
|
|
// if(option && option.id){
|
|
|
// this.isView = true
|
|
@@ -185,12 +182,20 @@
|
|
|
this.userDetailInfo={}
|
|
|
this.photograph=[]
|
|
|
this.rubbishTypeList=[]
|
|
|
- // this.latitude='' // 当前位置经度
|
|
|
- // this.longitude='' // 当前位置维度
|
|
|
+ this.rubbishTypeListData=[]
|
|
|
+ this.latitude='' // 当前位置经度
|
|
|
+ this.longitude='' // 当前位置维度
|
|
|
this.rubbishType()
|
|
|
this.getDetailData()
|
|
|
this.rubbishWeightType()
|
|
|
},
|
|
|
+ pageType(e){
|
|
|
+ this.val += e.data
|
|
|
+ if(this.val!='userInfo'){
|
|
|
+ this.pageInfo()
|
|
|
+ }
|
|
|
+ console.log(this.val,'----------',e)
|
|
|
+ },
|
|
|
// 获取垃圾分类
|
|
|
rubbishType () {
|
|
|
let _this = this
|
|
@@ -283,7 +288,7 @@
|
|
|
},
|
|
|
itemRubbishWeightChange(item){
|
|
|
this.checkWeightType=item.code
|
|
|
- console.log(item,item.code,'--------------',this.check)
|
|
|
+ console.log(item,item.code,'--------------',this.check,this.checkWeightType)
|
|
|
},
|
|
|
// 获取详情数据
|
|
|
getDetailData(){
|
|
@@ -375,7 +380,7 @@
|
|
|
params.reserveDateBegin=this.reserveDateBegin
|
|
|
params.reserveDateEnd=this.reserveDateEnd
|
|
|
}
|
|
|
- if(this.reserveWeight){
|
|
|
+ if(this.checkWeightType){
|
|
|
params.reserveWeight=this.checkWeightType
|
|
|
}
|
|
|
if(this.photograph){
|
|
@@ -389,6 +394,7 @@
|
|
|
})
|
|
|
params.rubbishTypeList=this.rubbishTypeList
|
|
|
}
|
|
|
+ console.log(params,'------------参数')
|
|
|
yuyueInfoSave(params).then(res=>{
|
|
|
if(res.status==200){
|
|
|
uni.showToast({
|