diff --git a/pages.json b/pages.json index c25ebf2..7e7562f 100644 --- a/pages.json +++ b/pages.json @@ -86,6 +86,28 @@ } } }, + { + "path": "pages/my/channelMerchants/myMerchants", + "style": { + "navigationBarTitleText": "我是渠道商", + "enablePullDownRefresh": false, + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/my/channelMerchants/index", + "style": { + "navigationBarTitleText": "申请渠道商", + "enablePullDownRefresh": false, + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, { "path": "pages/my/applyBroker/myBroker", "style": { diff --git a/pages/cooperate/hehuo1.vue b/pages/cooperate/hehuo1.vue new file mode 100644 index 0000000..b8a13e1 --- /dev/null +++ b/pages/cooperate/hehuo1.vue @@ -0,0 +1,455 @@ + + + + + diff --git a/pages/my/channelMerchants/index.vue b/pages/my/channelMerchants/index.vue new file mode 100644 index 0000000..44cdf8c --- /dev/null +++ b/pages/my/channelMerchants/index.vue @@ -0,0 +1,275 @@ + + + + + diff --git a/pages/my/channelMerchants/myMerchants.vue b/pages/my/channelMerchants/myMerchants.vue new file mode 100644 index 0000000..36c1794 --- /dev/null +++ b/pages/my/channelMerchants/myMerchants.vue @@ -0,0 +1,1470 @@ + + + + \ No newline at end of file diff --git a/pages/my/hehuo.vue b/pages/my/hehuo.vue index 880413d..6971788 100644 --- a/pages/my/hehuo.vue +++ b/pages/my/hehuo.vue @@ -4,32 +4,11 @@ 申请合作技师 - - - - - - - {{city}} - - - - - - - - 请选择城市 - - {{cityData}} - - - - + 姓名 @@ -135,7 +114,8 @@ - + + 提交申请 @@ -149,13 +129,9 @@ export default { data() { return { + cityList: [], + Cityshow: false, selected:[], - pickVal: [0, 0, 0], // 选择器默认值 - pickVal2:[], // 辅助城市名字线索 - cityArr: [], // 所有城市 - hotCitys: ['杭州', '天津', '北京', '上海', '深圳', '广州', '成都', '重庆', '厦门'], - locationValue: '正在定位...', - // auditContent: '', city: '', money: '', teamNumber: '', @@ -166,17 +142,24 @@ back:'', certification:[], bb:'1', - cityData:'', typeId: '', typeList:[] } }, onLoad() { this.getChannel(); - this.loadProvinces(); - this.fuwuType() + this.fuwuType(); + this.getKTCityList() }, methods: { + showCityList() { + this.Cityshow = true; + }, + getCity(e) { + console.log(e[0].label); + this.city = e[0].label; + this.getKTCityList(); + }, gukeBtn(item) { var index = this.selected.indexOf(item); if (index === -1) { @@ -201,77 +184,23 @@ } }); }, - loadProvinces() { // 加载省份 - uni.request({ - url: 'http://test-api.tiananhub.com/api/province/GetListProvince', - method: 'get', - success: async (res) => { - let { - data - } = res.data - console.log(data) - this.cityArr[0] = data - this.loadCities(data[0].AreaId) - this.$forceUpdate() - }, - fail: async (res) => {} - }) - }, - // 请求地级市 - loadCities(AreaId) { - uni.request({ - url: 'http://test-api.tiananhub.com/api/province/GetListCity', - data: { - AreaId - }, - method: 'get', - success: async (res) => { - let { - data - } = res.data - this.cityArr[1] = data - this.loadAreas(data[0].AreaId) - - this.$forceUpdate() - }, - fail: async (res) => {} - }) - }, - // 请求县区市 - loadAreas(AreaId) { - uni.request({ - url: 'http://test-api.tiananhub.com/api/province/GetListCity', - data: { - AreaId - }, - method: 'get', - success: async (res) => { - let { - data - } = res.data - this.cityArr[2] = data - - this.$forceUpdate() - }, - fail: async (res) => {} - }) - }, - // 确定其他选择的值 - bindPickerChange(data) { - this.pickVal=data.target.value; - this.pickVal2=data.target.value; - console.log("data====",this.pickVal2) - this.cityData=this.cityArr[0][this.pickVal2[0]].AreaName+'-'+this.cityArr[1][this.pickVal2[1]].AreaName+'-'+this.cityArr[2][this.pickVal2[2]].AreaName - - }, - // 选择时且未点击确定是的值 - pluginclass(e) { - if (e.detail.column == 0) { - this.loadCities(this.cityArr[0][e.detail.value].AreaId); - } - if (e.detail.column == 1) { - this.loadAreas(this.cityArr[1][e.detail.value].AreaId); - } + getKTCityList(){ + this.$Request.getT('/app/trip/selectTripList').then(res => { + if (res.code == 0) { + this.cityList = []; + let isOpen = false + let cityName = uni.getStorageSync('city') ? uni.getStorageSync('city') : '请选择城市' + res.data.forEach((d, index) => { + if (cityName === d.city) { + isOpen = true; + } + let data = {} + data.label = d.city + data.value = index + this.cityList.push(data); + }); + } + }); }, // 身份证正面删除 frontremove(index) { @@ -336,7 +265,7 @@ }); }, save() { - if (this.cityData === '') { + if (this.city === '') { this.$queue.showToast('请输入服务城市 ') return; } @@ -372,7 +301,7 @@ name: this.userName, phone: this.phone, age: this.age, - city: this.cityData, + city: this.city, front: this.front, back:this.back, certification:this.certification, diff --git a/pages/my/index.vue b/pages/my/index.vue index 0e7a66a..d29fb2f 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -153,7 +153,7 @@ 城市合伙人 - + + 我的团队 diff --git a/uni_modules/ch-picker/changelog.md b/uni_modules/ch-picker/changelog.md new file mode 100644 index 0000000..dfd5a2c --- /dev/null +++ b/uni_modules/ch-picker/changelog.md @@ -0,0 +1,12 @@ +## 1.0.5(2023-09-19) +添加点击切换; +## 1.0.4(2023-05-05) +添加confirm及cancel事件; +## 1.0.3(2023-05-04) +优化:减少参数、超出隐藏、样式定义等等 +## 1.0.2(2023-02-20) +消除插件外字体颜色造成的影响 +## 1.0.1(2022-07-19) +position为center时增加width属性 +## 1.0.0(2022-07-14) +初版,但是差一点的手机会卡顿,慎用 diff --git a/uni_modules/ch-picker/components/ch-picker-view/ch-picker-view.vue b/uni_modules/ch-picker/components/ch-picker-view/ch-picker-view.vue new file mode 100644 index 0000000..65b5258 --- /dev/null +++ b/uni_modules/ch-picker/components/ch-picker-view/ch-picker-view.vue @@ -0,0 +1,273 @@ + + + \ No newline at end of file diff --git a/uni_modules/ch-picker/components/ch-picker/ch-picker.vue b/uni_modules/ch-picker/components/ch-picker/ch-picker.vue new file mode 100644 index 0000000..2de49ce --- /dev/null +++ b/uni_modules/ch-picker/components/ch-picker/ch-picker.vue @@ -0,0 +1,276 @@ + + + + \ No newline at end of file diff --git a/uni_modules/ch-picker/package.json b/uni_modules/ch-picker/package.json new file mode 100644 index 0000000..cc2ba43 --- /dev/null +++ b/uni_modules/ch-picker/package.json @@ -0,0 +1,83 @@ +{ + "id": "ch-picker", + "displayName": "滚动选择器", + "version": "1.0.5", + "description": "滚动选择器,支持实时监听", + "keywords": [ + "滚动选择器", + "选择器", + "picker" +], + "repository": "https://gitee.com/ask_flowers_and_trees/ch-picker.git", + "engines": { + "HBuilderX": "^3.4.18" + }, +"dcloudext": { + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "插件不采集任何数据", + "permissions": "无" + }, + "npmurl": "", + "type": "component-vue" + }, + "uni_modules": { + "dependencies": [], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "Vue": { + "vue2": "y", + "vue3": "u" + }, + "App": { + "app-vue": "y", + "app-nvue": "u" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y", + "钉钉": "y", + "快手": "y", + "飞书": "y", + "京东": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/ch-picker/readme.md b/uni_modules/ch-picker/readme.md new file mode 100644 index 0000000..9536d70 --- /dev/null +++ b/uni_modules/ch-picker/readme.md @@ -0,0 +1,68 @@ + +## 基本用法 +```html + + + + + +``` + +## 启动方式 + `this.$refs.ChPicker.show()` + +## 属性 +| 属性 | 描述 | 类型 | 默认值 | +|--|--|--|--| +| clickMaskClose| 点击遮罩层关闭 | Boolean | true | +| columns| 每一列的数据 | Array| [] | +| defaultIndex| 默认选中值的下标,是数组 | Array | [] | +| position| 悬浮位置 | String | bottom | +| visibleCount| 每列中可见选项的数量,最大为5,最小为3 | String, Number | 5 | +| width| position为center时生效,不含单位时,默认单位是px | String, Number | 60vw | +| itemHeight| 单个选项的高度,会覆盖itemStyle内的height,单位是px | String, Number | 44 | +| itemStyle| 单个选项样式 | Object | {} | +| fields| 数组属性 | Object | {label: 'label',value: 'value',} | + +## 事件 +| 属性 | 描述 | 回调参数 +|--|--|--|--| +| change| 实时监听,选项发生改变时触发 | {indexs, columns},indexs:选中项下标数组;columns:选中项数组 | +| confirm| 点击确认按钮触发 | {indexs, columns},indexs:选中项下标数组;columns:选中项数组 | +| cancel| 点击取消按钮触发 | - |