diff --git a/api/main.js b/api/main.js deleted file mode 100644 index e12c6b0..0000000 --- a/api/main.js +++ /dev/null @@ -1,47 +0,0 @@ -// src/composables/useWeChatAuth.js -import { ref } from 'vue'; -import request from '@/request/index.js'; - -//解决跨域 -export function proxy(res){ - return request({ - url: `/api/proxy/get?apiUrl=${res.apiUrl}¶ms=${res.other}`, - method: 'get', - }) -} - -export const jsonp = function (url, data) { - return new Promise((resolve, reject) => { - // 1.初始化url - let dataString = url.indexOf('?') === -1 ? '?' : '&' - let callbackName = `jsonpCB_${Date.now()}`; - url += `${dataString}` - if (data) { - - // 2.有请求参数,依次添加到url - for (let k in data) { - url += `&${k}=${data[k]}` - } - } - - let scriptNode = document.createElement('script'); - scriptNode.src = url; - - // 3. callback - window[callbackName] = (result) => { - result ? resolve(result) : reject('没有返回数据'); - delete window[callbackName]; - document.body.removeChild(scriptNode); - } - - // 4. 异常情况 - scriptNode.addEventListener('error', () => { - reject('接口返回数据失败'); - delete window[callbackName]; - document.body.removeChild(scriptNode); - }, false) - - // 5. 开始请求 - document.body.appendChild(scriptNode) - }) -} diff --git a/compontent/public/camera.vue b/compontent/public/camera.vue index 71489e3..d758a05 100644 --- a/compontent/public/camera.vue +++ b/compontent/public/camera.vue @@ -21,7 +21,6 @@ const height = ref(600); // 裁剪完成的回调 const handleCrop = (e) => { - // console.log("剪切完了") uni.setStorageSync(`imgkey${type.value}`, e.tempFilePath); uni.navigateBack() } diff --git a/compontent/public/donghua.vue b/compontent/public/donghua.vue deleted file mode 100644 index 4b7ca23..0000000 --- a/compontent/public/donghua.vue +++ /dev/null @@ -1,121 +0,0 @@ - - - \ No newline at end of file diff --git a/compontent/public/exit.vue b/compontent/public/exit.vue index 29a4071..904e34b 100644 --- a/compontent/public/exit.vue +++ b/compontent/public/exit.vue @@ -5,10 +5,6 @@ - - 取消 确定 @@ -40,11 +36,7 @@ } const go = () => { if(props.cont=='是否退出登录?'){ - // uni.clearStorage() wx.exitMiniProgram() - // uni.reLaunch({ - // url:'/pages/login/index' - // }) }else{ emit('go'); } @@ -96,25 +88,6 @@ padding: 0 10%; } - .tittle-bgc { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 300rpx; - background-image: url('https://www.focusnu.com/media/directive/index/modelbgc.png'); - background-size: 100% auto; - background-position: top center; - background-repeat: no-repeat; - - .text { - color: #47526F; - font-size: 40rpx; - margin: 40rpx 0 0 50rpx; - font-weight: 600; - } - } - .button { width: 47%; background: linear-gradient(to bottom, #e7f4ff, #c5e5ff); @@ -134,8 +107,6 @@ display: flex; justify-content: center; align-items: center; - // color: #fff; - // color: rgb(242,242,242); font-size: 25rpx; border-radius: 24rpx; } diff --git a/compontent/public/downmenu.vue b/compontent/public/menus/mechanismdownmenu.vue similarity index 84% rename from compontent/public/downmenu.vue rename to compontent/public/menus/mechanismdownmenu.vue index 7186cba..a646c89 100644 --- a/compontent/public/downmenu.vue +++ b/compontent/public/menus/mechanismdownmenu.vue @@ -3,12 +3,9 @@ - - {{item}} @@ -37,28 +34,6 @@ const playing = ref(-1); const photoplay = ref(false); const itemArray = ["NU", "动态", "我的"]; - const donghuaArray = [genPaths( - '/static/donghua/home', - 'home', - 19, // 张数 - 'png', - 0, // 起始索引 - false // 不补零 - ),genPaths( - '/static/donghua/new', - 'new', - 18, // 张数 - 'png', - 0, // 起始索引 - false // 不补零 - ),genPaths( - '/static/donghua/my', - 'my', - 14, // 张数 - 'png', - 0, // 起始索引 - false // 不补零 - )] onMounted(() => { photoplay.value = true; @@ -82,7 +57,6 @@ }); break; } - } } diff --git a/compontent/public/oldmandownmenu.vue b/compontent/public/menus/oldmandownmenu.vue similarity index 100% rename from compontent/public/oldmandownmenu.vue rename to compontent/public/menus/oldmandownmenu.vue diff --git a/compontent/public/yuangongdownmenu.vue b/compontent/public/menus/staffdownmenu.vue similarity index 100% rename from compontent/public/yuangongdownmenu.vue rename to compontent/public/menus/staffdownmenu.vue diff --git a/compontent/public/gongyingshnagdownmenu.vue b/compontent/public/menus/supplierdownmenu.vue similarity index 84% rename from compontent/public/gongyingshnagdownmenu.vue rename to compontent/public/menus/supplierdownmenu.vue index e3b3a16..e0245db 100644 --- a/compontent/public/gongyingshnagdownmenu.vue +++ b/compontent/public/menus/supplierdownmenu.vue @@ -3,8 +3,6 @@ - @@ -37,28 +35,6 @@ const playing = ref(-1); const photoplay = ref(false); const itemArray = ["NU", "动态", "我的"]; - const donghuaArray = [genPaths( - '/static/donghua/home', - 'home', - 19, // 张数 - 'png', - 0, // 起始索引 - false // 不补零 - ), genPaths( - '/static/donghua/new', - 'new', - 18, // 张数 - 'png', - 0, // 起始索引 - false // 不补零 - ), genPaths( - '/static/donghua/my', - 'my', - 14, // 张数 - 'png', - 0, // 起始索引 - false // 不补零 - )] onMounted(() => { photoplay.value = true; diff --git a/main.js b/main.js index d8afdca..3bf9172 100644 --- a/main.js +++ b/main.js @@ -17,12 +17,10 @@ app.$mount() import { createSSRApp } from 'vue' -import donghua from '@/compontent/public/donghua.vue' export function createApp() { const app = createSSRApp(App) // 使用 uView UI app.use(uView) - app.component('donghua', donghua) return { app } diff --git a/pages.json b/pages.json index 65b782d..c3ff1c3 100644 --- a/pages.json +++ b/pages.json @@ -77,63 +77,63 @@ } }, { - "path": "pages/index/index", + "path": "pages/mechanismindex/index", "style": { "navigationBarTitleText": "首页", "enablePullDownRefresh": true } }, { - "path": "pages/index/mine", + "path": "pages/mechanismindex/mine", "style": { "navigationBarTitleText": "我的" } }, { - "path": "pages/yuangongindex/searchjigou", + "path": "pages/staffindex/searchjigou", "style": { "navigationBarTitleText": "查找" } }, { - "path": "pages/yuangongindex/workjoin", + "path": "pages/staffindex/workjoin", "style": { "navigationBarTitleText": "入驻审核" } }, { - "path": "pages/yuangongindex/message", + "path": "pages/staffindex/message", "style": { "navigationBarTitleText": "消息" } }, { - "path": "pages/yuangongindex/companyyaoqing", + "path": "pages/staffindex/companyyaoqing", "style": { "navigationBarTitleText": "公司邀请" } }, { - "path": "pages/yuangongindex/simpleyaoqing", + "path": "pages/staffindex/simpleyaoqing", "style": { "navigationBarTitleText": "公司邀请" } }, { - "path": "pages/yuangongindex/company", + "path": "pages/staffindex/company", "style": { "navigationBarTitleText": "公司详情" } }, { - "path": "pages/yuangongindex/index", + "path": "pages/staffindex/index", "style": { "navigationBarTitleText": "首页", "enablePullDownRefresh": true } }, { - "path": "pages/yuangongindex/mine", + "path": "pages/staffindex/mine", "style": { "navigationBarTitleText": "我的" } @@ -390,7 +390,7 @@ }, { - "path" : "pages/yuangongindex/purchaseorder", + "path" : "pages/staffindex/purchaseorder", "style" : { "navigationBarTitleText" : "", @@ -398,7 +398,7 @@ } }, { - "path" : "pages/yuangongindex/purchaseorderdetail", + "path" : "pages/staffindex/purchaseorderdetail", "style" : { "navigationBarTitleText" : "", @@ -406,7 +406,7 @@ } }, { - "path" : "pages/yuangongindex/detIlspro", + "path" : "pages/staffindex/detIlspro", "style" : { "navigationBarTitleText" : "" @@ -448,21 +448,21 @@ } }, { - "path" : "pages/yuangongindex/commission", + "path" : "pages/staffindex/commission", "style" : { "navigationBarTitleText" : "" } }, { - "path" : "pages/yuangongindex/daypay", + "path" : "pages/staffindex/daypay", "style" : { "navigationBarTitleText" : "" } }, { - "path" : "pages/yuangongindex/region", + "path" : "pages/staffindex/region", "style" : { "navigationBarTitleText" : "" diff --git a/pages/addjigou/api/addjigou.js b/pages/addjigou/api/addjigou.js index 6e5135d..3b31f4a 100644 --- a/pages/addjigou/api/addjigou.js +++ b/pages/addjigou/api/addjigou.js @@ -1,4 +1,3 @@ -// src/composables/useWeChatAuth.js import { ref } from 'vue'; import request from '@/request/index.js'; @@ -25,9 +24,6 @@ export function queryOrgInfoById(id){ }) } - - - export function queryOrgHis(id){ return request({ url: `/api/orgApplyInfo/queryOrgHis?openId=${id}&optType=rz,bg`, diff --git a/pages/index/index.vue b/pages/mechanismindex/index.vue similarity index 99% rename from pages/index/index.vue rename to pages/mechanismindex/index.vue index dca0230..3336982 100644 --- a/pages/index/index.vue +++ b/pages/mechanismindex/index.vue @@ -286,7 +286,7 @@ // import tu from 'https://www.focusnu.com/media/directive/index/tu.png' import request from '@/request/index.js' // 您封装的 uni.request - import downMenu from '@/compontent/public/downmenu.vue' + import downMenu from '@/compontent/public/menus/mechanismdownmenu.vue' import model from "@/compontent/public/model.vue" const tu = 'https://www.focusnu.com/media/directive/index/tu.png' diff --git a/pages/index/mine.vue b/pages/mechanismindex/mine.vue similarity index 98% rename from pages/index/mine.vue rename to pages/mechanismindex/mine.vue index 8ec1576..78387bf 100644 --- a/pages/index/mine.vue +++ b/pages/mechanismindex/mine.vue @@ -53,7 +53,7 @@ onUnmounted } from 'vue'; import exit from "@/compontent/public/exit.vue" - import downMenu from '@/compontent/public/downmenu.vue' + import downMenu from '@/compontent/public/menus/mechanismdownmenu.vue' const phone = ref("") const openid = ref("") diff --git a/pages/oldmanindex/daypay.vue b/pages/oldmanindex/daypay.vue index 938c913..55ec5ce 100644 --- a/pages/oldmanindex/daypay.vue +++ b/pages/oldmanindex/daypay.vue @@ -48,7 +48,7 @@