diff --git a/app.json b/app.json
index a04053b..6108d20 100644
--- a/app.json
+++ b/app.json
@@ -99,7 +99,7 @@
],
"permission": {
"scope.userLocation": {
- "desc": "你的位置信息将用获取最近的打包站"
+ "desc": "你的位置信息将用获取最近的打包厂"
}
},
"window": {
diff --git a/pages/agent/address/index.js b/pages/agent/address/index.js
index fb5348c..cff3c21 100644
--- a/pages/agent/address/index.js
+++ b/pages/agent/address/index.js
@@ -1,5 +1,5 @@
// pages/shop/apply/index.js
-import { createAddress } from "../../api/ztb"
+import { updateUserInfoZtb } from "../../api/ztb"
const util = require('../../../utils/util')
import regions from '../../../utils/region'
const app = getApp()
@@ -12,14 +12,7 @@ Page({
safeBottom: app.globalData.safeBottom,
options: regions,
region: [],
- form: {
- receiver:'',
- phone:'',
- details:'',
- locProvinceId: '',
- locCityId: '',
- districtId: ''
- },
+ form: {},
requesting: false
},
/**
@@ -44,7 +37,10 @@ Page({
}
},
submitForm: function(){
- if(util.isEmpty(this.data.form.receiver)){
+ if(this.data.requesting){
+ return
+ }
+ if(util.isEmpty(this.data.form.packageFactoryName)){
util.showToast('请输入工厂全称')
return
}
@@ -60,12 +56,14 @@ Page({
util.showToast('请输入发货人姓名')
return
}
+ this.data.requesting = true
wx.showLoading({ title: '处理中', mask: true })
- createAddress(this.data.form).then(res => {
+ updateUserInfoZtb(this.data.form).then(res => {
wx.hideLoading()
util.showBackToast('新增地址成功')
}).catch(err => {
- wx.hideLoading()
+ wx.hideLoading()
+ this.data.requesting = false
util.showToast(err)
})
}
diff --git a/pages/agent/address/index.wxml b/pages/agent/address/index.wxml
index c075304..4f844c0 100644
--- a/pages/agent/address/index.wxml
+++ b/pages/agent/address/index.wxml
@@ -1,24 +1,32 @@
- 送货信息
+ 发货信息
-
- 工厂全称：
-
+
+
+ 请补充
+ 您的工厂发货信息
+
+
+
+
+ 工厂全称：
+
- 所在地区：
+
+ 所在地区：
{{form.areaStr||'请选择所在地区'}}
- 详细地址：
-
+ 详细地址：
+
- 发货人姓名：
+ 发货人姓名：
diff --git a/pages/agent/edit/index.js b/pages/agent/edit/index.js
index a1aaa0c..f529aab 100644
--- a/pages/agent/edit/index.js
+++ b/pages/agent/edit/index.js
@@ -229,6 +229,17 @@ Page({
this.setData({ ['form.unitPrice']: this.data.form.unitPrice, ['form.publicSubsidies']: this.data.form.publicSubsidies, cateName: this.data.cateName })
}
},
+ editAddress: function(){
+ var that = this
+ var events = {}
+ events.onCallback = function(data){
+ if (data.what == 1030) {
+ // that.data.form.factoryCustomerId = data.detail.id
+ // that.setData({ ['form.factoryCustomerName']: data.detail.name })
+ }
+ }
+ wx.navigateTo({url: `/pages/agent/address/index`, events})
+ },
onEvent: function (message) {
if(message.what == 402){
// this.setData({ pageIndex: 0 })
diff --git a/pages/agent/edit/index.wxml b/pages/agent/edit/index.wxml
index 41e9425..3b6266a 100644
--- a/pages/agent/edit/index.wxml
+++ b/pages/agent/edit/index.wxml
@@ -56,6 +56,15 @@
+
+
+ 发货信息：
+
+ {{form.deliveryTime||'请填写发货信息'}}
+
+
+
+
diff --git a/pages/home/certificate/index.js b/pages/home/certificate/index.js
index 5f50d09..382e3e5 100644
--- a/pages/home/certificate/index.js
+++ b/pages/home/certificate/index.js
@@ -1,31 +1,40 @@
// pages/home/authory/index.js
-import { getAuthSession, certificateImage } from "../../api/user"
+import { certificateImage } from "../../api/user"
const util = require('../../../utils/util')
-const event = require('../../../utils/event.js')
+const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
+ monthList: [{ text: '1000吨以下', value: 1 }, { text: '1000-2000吨', value: 2 }, { text: '2000吨以上', value: 3 }],
+ expriseList: [{ text: '1年以下', value: 1 }, { text: '1-5年', value: 2 }, { text: '5-10年', value: 3 }, { text: '10年以上', value: 4 }],
form: { identityAuthToken: null },
flag: false, // 是否不可以编辑, false：可编辑；true：不可编辑
- imgList: [null, null]
+ disabled: true,
+ imgList: [null]
},
-
onLoad: function (options) {
- event.on('EventMessage', this, this.onEvent)
- wx.showLoading({ title: '加载中', mask: true })
- getAuthSession().then(result => {
- wx.hideLoading()
- this.data.form.identityAuthToken = result.data.token
- }).catch(error => {
- wx.hideLoading()
- })
+
},
- onEvent: function (message) {
- if (message.what == 82) {
- wx.navigateBack()
+ bindForm: function (e) {
+ // var form_data = 'form.' + e.target.id
+ this.data.form[e.target.id] = e.detail.value
+ },
+ showPicker: function (e) {
+ this.pickerView = this.pickerView || this.selectComponent('#picker-view')
+ if(e.currentTarget.id == 'shipmentPerMonth'){
+ this.pickerView.showPicker(this.data.monthList, null, 1)
+ } else if(e.currentTarget.id == 'experienceTag'){
+ this.pickerView.showPicker(this.data.expriseList, null, 2)
+ }
+ },
+ onPickerChange: function ({detail}) {
+ if(detail.type == 1){
+ this.setData({ ['form.shipmentPerMonth']: detail.text })
+ } else if(detail.type == 2){
+ this.setData({ ['form.experienceTag']: detail.text })
}
},
submitForm: function () {
@@ -70,8 +79,7 @@ Page({
let { data } = res // 编码后的数据
if(index == 0){
that.data.form.frontImg = {base64: data, type}
- } else {
- that.data.form.backImg = {base64: data, type}
+
}
}
})
@@ -94,8 +102,5 @@ Page({
var index = e.currentTarget.dataset.index
this.data.imgList[index] = null;
this.setData({ imgList: this.data.imgList })
- },
- onUnload: function () {
- event.remove('EventMessage', this)
}
})
\ No newline at end of file
diff --git a/pages/home/certificate/index.wxml b/pages/home/certificate/index.wxml
index ec0eca8..e21537f 100644
--- a/pages/home/certificate/index.wxml
+++ b/pages/home/certificate/index.wxml
@@ -4,7 +4,7 @@
- *请拍摄/上传本人身份证（头像面）
+ *请拍摄/上传营业执照