TmOct5/dou_fire
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决分支冲突

Browse Source
This commit is contained in:
唐明明
2023-04-25 15:54:49 +08:00
parent 8f5489a8df
commit 5a0c4e3671
5 changed files with 708 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
manifest.json
View File

@@ -2,8 +2,8 @@
"name" : "抖火",
"appid" : "__UNI__C305C03",
"description" : "纵有疾风起，人生不言弃",
"versionName" : "1.3.8",
"versionCode" : 103,
"versionName" : "1.4.3",
"versionCode" : 104,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@@ -43,7 +43,8 @@
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
],
"schemes" : "doufire"
"schemes" : "doufire",
"minSdkVersion" : 21
},
/* ios打包配置 */
"ios" : {
@@ -92,6 +93,22 @@
}
}
}
},
"nativePlugins" : {
"Pdf-Plugin" : {
"__plugin_info__" : {
"name" : "Pdf-Plugin",
"description" : "此插件为uni小程序Android原生插件,用于加载网络pdf,支持水印和缩放",
"platforms" : "Android",
"url" : "https://ext.dcloud.net.cn/plugin?id=11384",
"android_package_name" : "io.douhuofalv.com",
"ios_bundle_id" : "io.douhuofalv.com",
"isCloud" : true,
"bought" : 1,
"pid" : "11384",
"parameters" : {}
}
}
}
},
/* 快应用特有相关 */

18
pages.json
View File

@@ -3,7 +3,7 @@
"path": "pages/index/index",
"name": "Index",
"style": {
"navigationBarTitleText": "抖火法务咨询服务",
"navigationBarTitleText": "抖火法律咨询服务",
"navigationBarBackgroundColor": "#FFFFFF"
}
}, {
@@ -552,6 +552,22 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}, {
"path": "pages/user/signLog",
"name": "SignLog",
"style": {
"navigationBarTitleText": "合同记录",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}, {
"path": "pages/user/contract",
"name": "SignContract",
"style": {
"navigationBarTitleText": "合同",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFFFFF"
}
}],
"globalStyle": {
"navigationBarTextStyle": "black",

5
pages/account/withdraws.vue
View File

@@ -48,7 +48,6 @@
<view class="withdraws-hint">后台提现管理时间 上午11:00-12:00 下午17:00-18:00</view>
</view>
</template>
<script>
import { withdrawsCreate, withdraws } from '@/apis/interfaces/account.js'
export default {
@@ -93,11 +92,12 @@
this.identity = id_card
this.type = bank.message_type
this.isDisabled = has_bank
this.name = id_card.name
this.idcard = id_card.id_card_no
if(has_bank){
let bankIndex = this.banks.findIndex(val => val.name === bank.bank_name)
this.bankNo = bank.bank_no
this.mobile = bank.mobile
this.bankVal = bankIndex >= 0 ? bankIndex : 0
@@ -178,7 +178,6 @@
}
}
</script>
<style lang="scss">
.content{
padding: 30rpx;

90
pages/work/perfectBasis.vue
View File

@@ -122,6 +122,62 @@
</label>
<input class="from-input" v-model="baseInfo.now_company_name" placeholder="输入现单位名称">
</view>
<view class="from-item from-item-50">
<label>
<text>*</text>预留联系人1姓名
<uni-icons v-if="baseInfo.check_params.one_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.one_contact.description)"></uni-icons>
</label>
<input class="from-input" v-model="baseInfo.one_contact" placeholder="姓名">
</view>
<view class="from-item from-item-50">
<label>
<text>*</text>预留联系人1关系
<uni-icons v-if="baseInfo.check_params.one_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.one_contact_relation.description)"></uni-icons>
</label>
<input class="from-input" v-model="baseInfo.one_contact_relation" placeholder="关系">
</view>
<view class="from-item from-item-50">
<label>
预留联系人2姓名
<uni-icons v-if="baseInfo.check_params.two_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.two_contact.description)"></uni-icons>
</label>
<input class="from-input" v-model="baseInfo.two_contact" placeholder="姓名">
</view>
<view class="from-item from-item-50">
<label>
预留联系人2关系
<uni-icons v-if="baseInfo.check_params.two_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.two_contact_relation.description)"></uni-icons>
</label>
<input class="from-input" v-model="baseInfo.two_contact_relation" placeholder="关系">
</view>
<view class="from-item from-item-50">
<label>
预留联系人3姓名
<uni-icons v-if="baseInfo.check_params.three_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.three_contact.description)"></uni-icons>
</label>
<input class="from-input" v-model="baseInfo.three_contact" placeholder="姓名">
</view>
<view class="from-item from-item-50">
<label>
预留联系人3关系
<uni-icons v-if="baseInfo.check_params.three_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.three_contact_relation.description)"></uni-icons>
</label>
<input class="from-input" v-model="baseInfo.three_contact_relation" placeholder="关系">
</view>
<view class="from-item from-item-50">
<label>
预留联系人4姓名
<uni-icons v-if="baseInfo.check_params.four_contact" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.four_contact.description)"></uni-icons>
</label>
<input class="from-input" v-model="baseInfo.four_contact" placeholder="姓名">
</view>
<view class="from-item from-item-50">
<label>
预留联系人4关系
<uni-icons v-if="baseInfo.check_params.four_contact_relation" class="from-icon" type="info" size="18" color="red" @click="modifyToast(baseInfo.check_params.four_contact_relation.description)"></uni-icons>
</label>
<input class="from-input" v-model="baseInfo.four_contact_relation" placeholder="关系">
</view>
</view>
<view class="btn">
<button size="default" @click="onSubmit">提交基础资料</button>
@@ -129,7 +185,6 @@
</block>
</view>
</template>
<script>
import { perfectBase, updPerfectBase, historyBase } from '@/apis/interfaces/order.js'
import { region } from '@/apis/interfaces/address.js'
@@ -183,18 +238,26 @@
// 提交基础资料
onSubmit(){
let data = {
mobile : this.baseInfo.mobile,
marriage : this.baseInfo.marriage,
mate : this.baseInfo.mate,
education : this.baseInfo.education,
school : this.baseInfo.school,
tmp_address : this.baseInfo.tmp_address,
province_id : this.baseInfo.district_id,
city_id : this.baseInfo.city_id,
district_id : this.baseInfo.province_id,
now_domicile : this.baseInfo.now_domicile,
now_company_address : this.baseInfo.now_company_address,
now_company_name : this.baseInfo.now_company_name
mobile : this.baseInfo.mobile,
marriage : this.baseInfo.marriage,
mate : this.baseInfo.mate,
education : this.baseInfo.education,
school : this.baseInfo.school,
tmp_address : this.baseInfo.tmp_address,
province_id : this.baseInfo.district_id,
city_id : this.baseInfo.city_id,
district_id : this.baseInfo.province_id,
now_domicile : this.baseInfo.now_domicile,
now_company_address : this.baseInfo.now_company_address,
now_company_name : this.baseInfo.now_company_name,
one_contact : this.baseInfo.one_contact,
one_contact_relation : this.baseInfo.one_contact_relation,
two_contact : this.baseInfo.two_contact,
two_contact_relation : this.baseInfo.two_contact_relation,
three_contact : this.baseInfo.three_contact,
three_contact_relation : this.baseInfo.three_contact_relation,
four_contact : this.baseInfo.four_contact,
four_contact_relation : this.baseInfo.four_contact_relation
}
uni.showModal({
title : '提示',
@@ -285,7 +348,6 @@
}
}
</script>
<style lang="scss">
.content{
padding-top: 30rpx;