diff --git a/App.vue b/App.vue index f71439e..4152317 100644 --- a/App.vue +++ b/App.vue @@ -33,63 +33,63 @@ export default { this.globalData.config = config; }, checkLogin() { - const launchOptions = uni.getLaunchOptionsSync(); - const { query } = launchOptions; - console.log(query, "query"); + // const launchOptions = uni.getLaunchOptionsSync(); + // const { query } = launchOptions; + // console.log(query, "query"); // console.log(Object.keys(query).length,"query.lengh"); - console.log(getToken(), "getToken()"); - if (!getToken()) { - if (Object.keys(query).length !== 0) { - console.log("获取query"); - // let params = this.getRequestParams(); - // console.log(params,"params携带的参数"); - // if (location.href.includes("code=")) { - const code = query.code; - const token = query.token; - uni.setStorageSync("token", token); - // console.log(code,"code"); - // console.log(token,"token"); - getSqByaccesstoken({ - code: code, - }) - .then((res) => { - // console.log("获取accessToken"); - uni.setStorageSync("accessToken", res.data.accessToken); - return getUserinfo({ - accessToken: res.data.accessToken, - }); - }) - .then((el) => { - this.$tab.switchTab("/pages/index"); - uni.setStorageSync("userInfo", el.data); - setToken(el.data.token); - // location.reload(); - console.log("用户信息", el); - }); - // } - } else { - // // #ifdef APP - console.log("进入APP判断"); - // this.$tab.reLaunch("/pages/myLogin"); - uni.reLaunch({ - url: "/pages/myLogin", - }); - // 打开手机浏览器指定的url - // plus.runtime.openURL( "https://t-jn-development-manager.jsszkd.com/login?clientId=641775453324", this.openErr ); - // // #endif - // // #ifdef H5 - // location.href = `https://t-jn-development-manager.jsszkd.com/login?clientId=641775453324` - // // #endif + // console.log(getToken(), "getToken()"); + // if (!getToken()) { + // if (Object.keys(query).length !== 0) { + // console.log("获取query"); + // // let params = this.getRequestParams(); + // // console.log(params,"params携带的参数"); + // // if (location.href.includes("code=")) { + // const code = query.code; + // const token = query.token; + // uni.setStorageSync("token", token); + // // console.log(code,"code"); + // // console.log(token,"token"); + // getSqByaccesstoken({ + // code: code, + // }) + // .then((res) => { + // // console.log("获取accessToken"); + // uni.setStorageSync("accessToken", res.data.accessToken); + // return getUserinfo({ + // accessToken: res.data.accessToken, + // }); + // }) + // .then((el) => { + // this.$tab.switchTab("/pages/index"); + // uni.setStorageSync("userInfo", el.data); + // setToken(el.data.token); + // // location.reload(); + // console.log("用户信息", el); + // }); + // // } + // } else { + // // // #ifdef APP + // console.log("进入APP判断"); + // // this.$tab.reLaunch("/pages/myLogin"); + // uni.reLaunch({ + // url: "/pages/myLogin", + // }); + // // 打开手机浏览器指定的url + // // plus.runtime.openURL( "https://t-jn-development-manager.jsszkd.com/login?clientId=641775453324", this.openErr ); + // // // #endif + // // // #ifdef H5 + // // location.href = `https://t-jn-development-manager.jsszkd.com/login?clientId=641775453324` + // // // #endif - console.log("Before navigateTo or reLaunch"); - // this.$tab.reLaunch("/pages/myLogin"); - // uni.navigateTo({ - // url:'https://t-jn-development-manager.jsszkd.com/login?clientId=641775453324' - // }) - } - } else { - this.$tab.reLaunch("/pages/index"); - } + // console.log("Before navigateTo or reLaunch"); + // // this.$tab.reLaunch("/pages/myLogin"); + // // uni.navigateTo({ + // // url:'https://t-jn-development-manager.jsszkd.com/login?clientId=641775453324' + // // }) + // } + // } else { + // this.$tab.reLaunch("/pages/index"); + // } }, openErr(err) { console.log(err, "报错信息"); diff --git a/api/jn/apply.js b/api/jn/apply.js index bf7ecc1..47b10d4 100644 --- a/api/jn/apply.js +++ b/api/jn/apply.js @@ -7,8 +7,22 @@ export function listActivity(query) { method: "get", params: query, }); +} +//门前三包评级规则 +export function listraterule(query) { + return request({ + url: "/jn/raterule/list", + method: "get", + params: query, + }); +} +export function listysfwlist(query) { + return request({ + url: "/jn/ysfw/list", + method: "get", + params: query, + }); } - // 查询活动申请详细 export function getActivity(id) { return request({ @@ -41,4 +55,11 @@ export function delActivity(id) { url: "/jn/activity/" + id, method: "delete", }); +} +//获取沿街店铺列表详细信息 +export function jnshop(id) { + return request({ + url: "/jn/shop/" + id, + method: "GET", + }); } diff --git a/components/fixedButtom/fixedButtom.vue b/components/fixedButtom/fixedButtom.vue index 6891257..1298630 100644 --- a/components/fixedButtom/fixedButtom.vue +++ b/components/fixedButtom/fixedButtom.vue @@ -44,6 +44,7 @@ /* 兼容 iOS < 11.2 */ padding: 20rpx 20rpx calc(20rpx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */ - border-top: 1px solid #DCE3EC; + border-top: 1px solid #DCE3EC; + z-index: 3; } \ No newline at end of file diff --git a/config.js b/config.js index 5cd0a34..b710637 100644 --- a/config.js +++ b/config.js @@ -1,6 +1,6 @@ // 应用全局配置 module.exports = { - // baseUrl: "http://39.101.188.84:9037", + // baseUrl: "http://192.168.0.105:9037", TEST_LOGIN:"https://t-jn-development-manager.jsszkd.com/login", // ?clientId= baseUrl: "https://t-jn-bjh-admin-server.jsszkd.com", diff --git a/main.js b/main.js index f7b758f..a239e4b 100644 --- a/main.js +++ b/main.js @@ -11,7 +11,7 @@ Vue.use(uView) // import 'video.js/dist/video-js.css' // Vue.prototype.$video = Videojs -import 'mui-player/dist/mui-player.min.css' +// import 'mui-player/dist/mui-player.min.css' import fixedButtom from '@/components/fixedButtom/fixedButtom.vue' Vue.component('fixedButtom', fixedButtom) diff --git a/pages.json b/pages.json index eb05125..bb5590e 100644 --- a/pages.json +++ b/pages.json @@ -105,7 +105,7 @@ "subPackages": [ { "root": "subcontract/work/", - "pages": [ + "pages": [ { "path": "event/index", "style": { @@ -256,7 +256,15 @@ "navigationBarTitleText": "新增店铺活动", "enablePullDownRefresh": false } - }, + }, + { + "path" : "activity/activitydetails", + "style" : + { + "navigationBarTitleText": "活动详情", + "enablePullDownRefresh": false + } + }, { "path": "threeGuarantees/index", "style": { @@ -298,7 +306,8 @@ "navigationBarTitleText": "消息中心", "enablePullDownRefresh": false } - } + } + ] } ], diff --git a/pages/index.vue b/pages/index.vue index 5248ca0..1e59324 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -52,7 +52,7 @@ export default { return { grids: [ { - name: "水生态治理科教（公众）", + name: "水生态治理科教", gridImg: "/static/images/umale/gr8.png", color: "#0D306B", subcolor: "", @@ -60,7 +60,7 @@ export default { toPage: "/subPublic/waterEducation/index", }, { - name: "活动管理(商家)", + name: "活动管理", gridImg: "/static/images/umale/gr8.png", color: "#0D306B", subcolor: "", @@ -68,7 +68,7 @@ export default { toPage: "/subEnterprise/activity/activity", }, { - name: "消息中心(商家)", + name: "消息中心", gridImg: "/static/images/umale/gr8.png", color: "#0D306B", subcolor: "", @@ -76,7 +76,7 @@ export default { toPage: "/subEnterprise/msg/index", }, { - name: "门前三包服务(商家)", + name: "门前三包服务", gridImg: "/static/images/umale/gr8.png", color: "#0D306B", subcolor: "", @@ -84,7 +84,7 @@ export default { toPage: "/subEnterprise/threeGuarantees/index", }, { - name: "店铺店招预审(商家)", + name: "店牌店招预审", gridImg: "/static/images/umale/gr8.png", color: "#0D306B", subcolor: "", @@ -132,11 +132,11 @@ export default { onLoad() { // this.getCircle(); - this.getUserLocation(); - this.times = setInterval(() => { - console.log("获取用户位置信息"); - this.getUserLocation(); - }, 10000); + // this.getUserLocation(); + // this.times = setInterval(() => { + // console.log("获取用户位置信息"); + // this.getUserLocation(); + // }, 10000); }, mounted() { this.userInfo = uni.getStorageSync("userInfo"); diff --git a/pages/myLogin.vue b/pages/myLogin.vue index b9438f5..5697787 100644 --- a/pages/myLogin.vue +++ b/pages/myLogin.vue @@ -35,7 +35,7 @@ export default { this.webview.overrideUrlLoading({ mode: "reject" }, (e) => { //根据参数的不同,做不同的操作!url中,把双引号用别的字符串替换.就OK了.再替换回来可以转json console.warn("参数为:" + e.url); - // http://39.101.188.84:9999/demo/JiangNingUmale-App/#/?code=ckyb2r&clientId=641775453324&token=pygHmfvDNt4YxbucxXiIm0dN8d0IuLmd + // 获取当前页面的 URL var url = e.url; diff --git a/static/images/banner/green.png b/static/images/banner/green.png new file mode 100644 index 0000000..8574c55 Binary files /dev/null and b/static/images/banner/green.png differ diff --git a/static/images/banner/liucheng.png b/static/images/banner/liucheng.png new file mode 100644 index 0000000..b599cd9 Binary files /dev/null and b/static/images/banner/liucheng.png differ diff --git a/static/images/banner/orng.png b/static/images/banner/orng.png new file mode 100644 index 0000000..57bab65 Binary files /dev/null and b/static/images/banner/orng.png differ diff --git a/static/images/banner/red.png b/static/images/banner/red.png new file mode 100644 index 0000000..4cefe83 Binary files /dev/null and b/static/images/banner/red.png differ diff --git a/subEnterprise/activity/activity - 副本.vue b/subEnterprise/activity/activity - 副本.vue new file mode 100644 index 0000000..3d2c769 --- /dev/null +++ b/subEnterprise/activity/activity - 副本.vue @@ -0,0 +1,299 @@ + + + + + \ No newline at end of file diff --git a/subEnterprise/activity/activity.vue b/subEnterprise/activity/activity.vue index da62176..a7124f5 100644 --- a/subEnterprise/activity/activity.vue +++ b/subEnterprise/activity/activity.vue @@ -1,241 +1,177 @@ - - - - - + + + + + \ No newline at end of file diff --git a/subEnterprise/activity/activitydetails.vue b/subEnterprise/activity/activitydetails.vue new file mode 100644 index 0000000..70ed15d --- /dev/null +++ b/subEnterprise/activity/activitydetails.vue @@ -0,0 +1,129 @@ + + + + + \ No newline at end of file diff --git a/subEnterprise/activity/add.vue b/subEnterprise/activity/add.vue index aff52fb..14c8954 100644 --- a/subEnterprise/activity/add.vue +++ b/subEnterprise/activity/add.vue @@ -1,191 +1,265 @@ - - - - - + + + + + \ No newline at end of file diff --git a/subEnterprise/activity/addtow.vue b/subEnterprise/activity/addtow.vue new file mode 100644 index 0000000..aff52fb --- /dev/null +++ b/subEnterprise/activity/addtow.vue @@ -0,0 +1,191 @@ + + + + + diff --git a/subEnterprise/prequalification/index.vue b/subEnterprise/prequalification/index.vue index f1fef09..8fcc953 100644 --- a/subEnterprise/prequalification/index.vue +++ b/subEnterprise/prequalification/index.vue @@ -1,142 +1,245 @@ - - - - - + + + + + \ No newline at end of file diff --git a/subEnterprise/threeGuarantees/index.vue b/subEnterprise/threeGuarantees/index.vue index 61d70e7..2ecaf3a 100644 --- a/subEnterprise/threeGuarantees/index.vue +++ b/subEnterprise/threeGuarantees/index.vue @@ -1,155 +1,236 @@ - - - - - + + + + + \ No newline at end of file diff --git a/uni_modules/uview-ui/components/u-scroll-list/scrollWxs.wxs b/uni_modules/uview-ui/components/u-scroll-list/scrollWxs.wxs index ce94f1d..cd69284 100644 --- a/uni_modules/uview-ui/components/u-scroll-list/scrollWxs.wxs +++ b/uni_modules/uview-ui/components/u-scroll-list/scrollWxs.wxs @@ -3,7 +3,7 @@ function scroll(event, ownerInstance) { var detail = event.detail var scrollWidth = detail.scrollWidth var scrollLeft = detail.scrollLeft - // 获取当前组件的dataset，说白了就是祸国殃民的腾xun搞出来的垃ji + // 获取当前组件的dataset，说白了就是搞出来的垃ji var dataset = event.currentTarget.dataset // 此为scroll-view外部包裹元素的宽度 // 某些HX版本(3.1.18)，发现view元素中大写的data-scrollWidth，在wxs中，变成了全部小写，所以这里需要特别处理