From fa7cf1ec2985cbcb32a634843e5ae3a806f5b68b Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Thu, 15 Aug 2024 18:48:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ios=E7=AD=BE=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/api.js | 2 + config/site.config.js | 5 +- manifest.json | 9 +- pages.json | 15 +- pages/carEntry/signature/signature.vue | 6 + pages/indexEntry/enroll/payment/payh5.vue | 1 + pages/indexEntry/enroll/payment/payment.vue | 1 - pages/indexEntry/findShcool/findShcool.vue | 12 +- pages/indexEntry/findShcool/screen/screen.vue | 6 +- pages/mineEntry/myOrder/detail/comp/refundInfo.vue | 20 +- pages/mineEntry/myOrder/detail/detail.vue | 7 +- pages/mineEntry/personaInfo/personaInfo.vue | 74 ++- pages/mineEntry/refund/comp/myform.vue | 9 +- pages/mineEntry/refund/refund.vue | 16 +- .../uAvatarCropper/uAvatarCropper - 副本.vue | 285 +++++++++ pages/mineEntry/uAvatarCropper/uAvatarCropper.vue | 260 ++++++++ pages/mineEntry/uAvatarCropper/weCropper.js | 709 +++++++++++++++++++++ pages/tabbar/index/comp/coachItem.vue | 2 +- pages/tabbar/index/index.vue | 26 +- pages/tabbar/mine/index.vue | 12 +- store/modules/user.js | 7 +- 21 files changed, 1421 insertions(+), 63 deletions(-) create mode 100644 pages/mineEntry/uAvatarCropper/uAvatarCropper - 副本.vue create mode 100644 pages/mineEntry/uAvatarCropper/uAvatarCropper.vue create mode 100644 pages/mineEntry/uAvatarCropper/weCropper.js diff --git a/config/api.js b/config/api.js index d8a63c5..aa93aec 100644 --- a/config/api.js +++ b/config/api.js @@ -228,6 +228,8 @@ export const periodConfirm = (data) => http.post('app/student-process/periodConf export const order_info = (data) => http.post('pay/ysb/order_info', data) // 退学申请 export const refuse_apply = (data) => http.post('pay/ysb/refuse_apply', data) + // 获取退款申请的金额 + export const refund_amount = (data) => http.post('pay/ysb/refund_amount', data) diff --git a/config/site.config.js b/config/site.config.js index ee5210b..c988e84 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -8,7 +8,7 @@ module.exports = { imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/', // 支付测试地址 // preUrl: 'https://u8wbs.zyebank.cn/cem_ysb_u6/index.html', - // const preUrl = 'https://u8wbs.zyebank.cn/cem_ysb_u8/index.html' + // preUrl: 'https://u8wbs.zyebank.cn/cem_ysb_u8/index.html', // 生产地址 preUrl: 'https://zmcht.zybank.com.cn/cem_ysb/index.html', }; @@ -16,4 +16,5 @@ module.exports = { // http://123.6.232.1:8099/测试地址 // http://192.168.1.43:8318/本地地址 -//http://www.lyjppt.com/正式地址 \ No newline at end of file +//http://www.lyjppt.com/正式地址 + diff --git a/manifest.json b/manifest.json index 50682b0..202b4d2 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "洛阳学车", "appid" : "__UNI__3347C6E", "description" : "", - "versionName" : "1.3.7", - "versionCode" : 137, + "versionName" : "1.4.0", + "versionCode" : 140, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -77,13 +77,14 @@ "applinks:static-mp-87b9fa27-0273-48d3-a586-bd058cd2ce3d.next.bspapp.com" ] } - } + }, + "idfa" : false }, /* SDK配置 */ "sdkConfigs" : { "share" : { "weixin" : { - "appid" : "wx6cf612192cd6927c", + "appid" : "wxa6a7ba6856767880", "UniversalLinks" : "https://static-mp-87b9fa27-0273-48d3-a586-bd058cd2ce3d.next.bspapp.com/uni-universallinks/__UNI__3347C6E/" } }, diff --git a/pages.json b/pages.json index 613a769..0594a02 100644 --- a/pages.json +++ b/pages.json @@ -66,7 +66,7 @@ "style": { "navigationBarTitleText": "", "enablePullDownRefresh": false, - // "navigationStyle": "custom", + "navigationStyle": "custom", // "navigationBarLoading": false, "backgroundTextStyle": "dark" } @@ -356,7 +356,10 @@ "style": { "navigationBarTitleText": "签名", "enablePullDownRefresh": false, - "backgroundTextStyle": "dark" + "backgroundTextStyle": "dark", + "app-plus": {//app平台 + "bounce": "none"//禁止滚动 + } } } ] @@ -373,6 +376,14 @@ } }, { + "path": "uAvatarCropper/uAvatarCropper", + "style": { + "navigationBarTitleText": "修改头像", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { "path": "aboutUs/aboutUs", "style": { "navigationBarTitleText": "关于我们", diff --git a/pages/carEntry/signature/signature.vue b/pages/carEntry/signature/signature.vue index e887b93..e493bb2 100644 --- a/pages/carEntry/signature/signature.vue +++ b/pages/carEntry/signature/signature.vue @@ -45,6 +45,7 @@ subject: 1, }; }, + onLoad(options) { this.subject = options.subject }, @@ -189,6 +190,9 @@ }; diff --git a/pages/mineEntry/uAvatarCropper/uAvatarCropper.vue b/pages/mineEntry/uAvatarCropper/uAvatarCropper.vue new file mode 100644 index 0000000..6d5d133 --- /dev/null +++ b/pages/mineEntry/uAvatarCropper/uAvatarCropper.vue @@ -0,0 +1,260 @@ + + + + + diff --git a/pages/mineEntry/uAvatarCropper/weCropper.js b/pages/mineEntry/uAvatarCropper/weCropper.js new file mode 100644 index 0000000..a269105 --- /dev/null +++ b/pages/mineEntry/uAvatarCropper/weCropper.js @@ -0,0 +1,709 @@ +(function(global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : + typeof define === 'function' && define.amd ? define(factory) : + (global.weCropper = factory()); +}(this, (function() { + 'use strict'; + + /** + * Created by sail on 2017/6/11. + */ + var device = void 0; + var TOUCH_STATE = ['touchstarted', 'touchmoved', 'touchended']; + + function firstLetterUpper(str) { + return str.charAt(0).toUpperCase() + str.slice(1); + } + + function setTouchState(instance) { + for (var _len = arguments.length, arg = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { + arg[_key - 1] = arguments[_key]; + } + + TOUCH_STATE.forEach(function(key, i) { + if (arg[i] !== undefined) { + instance[key] = arg[i]; + } + }); + } + + function validator(instance, o) { + Object.defineProperties(instance, o); + } + + function getDevice() { + if (!device) { + device = wx.getSystemInfoSync(); + } + return device; + } + + var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function(obj) { + return typeof obj; + } : function(obj) { + return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; + }; + + + + + var classCallCheck = function(instance, Constructor) { + if (!(instance instanceof Constructor)) { + throw new TypeError("Cannot call a class as a function"); + } + }; + + var createClass = function() { + function defineProperties(target, props) { + for (var i = 0; i < props.length; i++) { + var descriptor = props[i]; + descriptor.enumerable = descriptor.enumerable || false; + descriptor.configurable = true; + if ("value" in descriptor) descriptor.writable = true; + Object.defineProperty(target, descriptor.key, descriptor); + } + } + + return function(Constructor, protoProps, staticProps) { + if (protoProps) defineProperties(Constructor.prototype, protoProps); + if (staticProps) defineProperties(Constructor, staticProps); + return Constructor; + }; + }(); + + + + + var slicedToArray = function() { + function sliceIterator(arr, i) { + var _arr = []; + var _n = true; + var _d = false; + var _e = undefined; + + try { + for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { + _arr.push(_s.value); + + if (i && _arr.length === i) break; + } + } catch (err) { + _d = true; + _e = err; + } finally { + try { + if (!_n && _i["return"]) _i["return"](); + } finally { + if (_d) throw _e; + } + } + + return _arr; + } + + return function(arr, i) { + if (Array.isArray(arr)) { + return arr; + } else if (Symbol.iterator in Object(arr)) { + return sliceIterator(arr, i); + } else { + throw new TypeError("Invalid attempt to destructure non-iterable instance"); + } + }; + }(); + + var tmp = {}; + + var DEFAULT = { + id: { + default: 'cropper', + get: function get$$1() { + return tmp.id; + }, + set: function set$$1(value) { + if (typeof value !== 'string') {} + tmp.id = value; + } + }, + width: { + default: 750, + get: function get$$1() { + return tmp.width; + }, + set: function set$$1(value) { + tmp.width = value; + } + }, + height: { + default: 750, + get: function get$$1() { + return tmp.height; + }, + set: function set$$1(value) { + tmp.height = value; + } + }, + scale: { + default: 2.5, + get: function get$$1() { + return tmp.scale; + }, + set: function set$$1(value) { + tmp.scale = value; + } + }, + zoom: { + default: 5, + get: function get$$1() { + return tmp.zoom; + }, + set: function set$$1(value) { + tmp.zoom = value; + } + }, + src: { + default: 'cropper', + get: function get$$1() { + return tmp.src; + }, + set: function set$$1(value) { + tmp.src = value; + } + }, + cut: { + default: {}, + get: function get$$1() { + return tmp.cut; + }, + set: function set$$1(value) { + tmp.cut = value; + } + }, + onReady: { + default: null, + get: function get$$1() { + return tmp.ready; + }, + set: function set$$1(value) { + tmp.ready = value; + } + }, + onBeforeImageLoad: { + default: null, + get: function get$$1() { + return tmp.beforeImageLoad; + }, + set: function set$$1(value) { + tmp.beforeImageLoad = value; + } + }, + onImageLoad: { + default: null, + get: function get$$1() { + return tmp.imageLoad; + }, + set: function set$$1(value) { + tmp.imageLoad = value; + } + }, + onBeforeDraw: { + default: null, + get: function get$$1() { + return tmp.beforeDraw; + }, + set: function set$$1(value) { + tmp.beforeDraw = value; + } + } + }; + + /** + * Created by sail on 2017/6/11. + */ + function prepare() { + var self = this; + + var _getDevice = getDevice(), + windowWidth = _getDevice.windowWidth; + + self.attachPage = function() { + var pages = getCurrentPages + // 获取到当前page上下文 + (); + var pageContext = pages[pages.length - 1]; + // 把this依附在Page上下文的wecropper属性上，便于在page钩子函数中访问 + pageContext.wecropper = self; + }; + + self.createCtx = function() { + var id = self.id; + + if (id) { + self.ctx = wx.createCanvasContext(id); + } + }; + + self.deviceRadio = windowWidth / 750; + self.deviceRadio=self.deviceRadio.toFixed(2) + } + + /** + * + */ + function observer() { + var self = this; + + var EVENT_TYPE = ['ready', 'beforeImageLoad', 'beforeDraw', 'imageLoad']; + + self.on = function(event, fn) { + if (EVENT_TYPE.indexOf(event) > -1) { + if (typeof fn === 'function') { + event === 'ready' ? fn(self) : self['on' + firstLetterUpper(event)] = fn; + } + } + return self; + }; + } + + /** + * Created by sail on 2017/6/11. + */ + function methods() { + var self = this; + + var deviceRadio = self.deviceRadio; + console.log(JSON.stringify(self)); + + var boundWidth = self.width; // 裁剪框默认宽度，即整个画布宽度 + var boundHeight = self.height; // 裁剪框默认高度，即整个画布高度 + var _self$cut = self.cut, + _self$cut$x = _self$cut.x, + x = _self$cut$x === undefined ? 0 : _self$cut$x, + _self$cut$y = _self$cut.y, + y = _self$cut$y === undefined ? 0 : _self$cut$y, + _self$cut$width = _self$cut.width, + width = _self$cut$width === undefined ? boundWidth : _self$cut$width, + _self$cut$height = _self$cut.height, + height = _self$cut$height === undefined ? boundHeight : _self$cut$height; + + + self.updateCanvas = function() { + if (self.croperTarget) { + + // 画布绘制图片 + self.ctx.drawImage(self.croperTarget, self.imgLeft, self.imgTop, self.scaleWidth, self.scaleHeight); + } + typeof self.onBeforeDraw === 'function' && self.onBeforeDraw(self.ctx, self); + + self.setBoundStyle // 设置边界样式 + (); + self.ctx.draw(); + return self; + }; + + self.pushOrign = function(src) { + self.src = src; + + typeof self.onBeforeImageLoad === 'function' && self.onBeforeImageLoad(self.ctx, self); + + uni.getImageInfo({ + src: src, + success: function success(res) { + var innerAspectRadio = res.width / res.height; + self.croperTarget = res.path||src; + if (innerAspectRadio < width / height) { + self.rectX = x; + self.baseWidth = width; + self.baseHeight = width / innerAspectRadio; + self.rectY = y - Math.abs((height - self.baseHeight) / 2); + } else { + self.rectY = y; + self.baseWidth = height * innerAspectRadio; + self.baseHeight = height; + self.rectX = x - Math.abs((width - self.baseWidth) / 2); + } + + self.imgLeft = self.rectX; + self.imgTop = self.rectY; + self.scaleWidth = self.baseWidth; + self.scaleHeight = self.baseHeight; + + self.updateCanvas(); + + typeof self.onImageLoad === 'function' && self.onImageLoad(self.ctx, self); + } + }); + + self.update(); + return self; + }; + + self.getCropperImage = function() { + for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) { + args[_key] = arguments[_key]; + } + + var id = self.id; + + var ARG_TYPE = toString.call(args[0]); + switch (ARG_TYPE) { + case '[object Object]': + var _args$0$quality = args[0].quality, + quality = _args$0$quality === undefined ? 10 : _args$0$quality; + console.log("quality--"+quality); + + uni.canvasToTempFilePath({ + canvasId: id, + x: x, + y: y, + width: width, + height: height, + destWidth: width * quality / (deviceRadio * 10), + destHeight: height * quality / (deviceRadio * 10), + success: function success(res) { + console.log(res); + typeof args[args.length - 1] === 'function' && args[args.length - 1](res.tempFilePath); + } + }); + break; + case '[object Function]': + uni.canvasToTempFilePath({ + canvasId: id, + x: x, + y: y, + fileType:"jpg", + width: width, + height: height, + destWidth: width , + destHeight: height, + success: function success(res) { + + typeof args[args.length - 1] === 'function' && args[args.length - 1](res.tempFilePath); + } + }); + break; + } + + return self; + }; + } + + /** + * Created by sail on 2017/6/11. + */ + function update() { + var self = this; + if (!self.src) return; + + self.__oneTouchStart = function(touch) { + self.touchX0 = touch.x; + self.touchY0 = touch.y; + }; + + self.__oneTouchMove = function(touch) { + var xMove = void 0, + yMove = void 0; + //计算单指移动的距离 + if (self.touchended) { + return self.updateCanvas(); + } + xMove = touch.x - self.touchX0; + yMove = touch.y - self.touchY0; + + var imgLeft = self.rectX + xMove; + var imgTop = self.rectY + yMove; + + self.outsideBound(imgLeft, imgTop); + + self.updateCanvas(); + }; + + self.__twoTouchStart = function(touch0, touch1) { + var xMove = void 0, + yMove = void 0, + oldDistance = void 0; + + self.touchX1 = self.rectX + self.scaleWidth / 2; + self.touchY1 = self.rectY + self.scaleHeight / 2; + + //计算两指距离 + xMove = touch1.x - touch0.x; + yMove = touch1.y - touch0.y; + oldDistance = Math.sqrt(xMove * xMove + yMove * yMove); + + self.oldDistance = oldDistance; + }; + + self.__twoTouchMove = function(touch0, touch1) { + var xMove = void 0, + yMove = void 0, + newDistance = void 0; + var scale = self.scale, + zoom = self.zoom; + // 计算二指最新距离 + + xMove = touch1.x - touch0.x; + yMove = touch1.y - touch0.y; + newDistance = Math.sqrt(xMove * xMove + yMove * yMove + + // 使用0.005的缩放倍数具有良好的缩放体验 + ); + self.newScale = self.oldScale + 0.001 * zoom * (newDistance - self.oldDistance); + + // 设定缩放范围 + self.newScale <= 1 && (self.newScale = 1); + self.newScale >= scale && (self.newScale = scale); + + self.scaleWidth = self.newScale * self.baseWidth; + self.scaleHeight = self.newScale * self.baseHeight; + var imgLeft = self.touchX1 - self.scaleWidth / 2; + var imgTop = self.touchY1 - self.scaleHeight / 2; + + self.outsideBound(imgLeft, imgTop); + + self.updateCanvas(); + }; + + self.__xtouchEnd = function() { + self.oldScale = self.newScale; + self.rectX = self.imgLeft; + self.rectY = self.imgTop; + }; + } + + /** + * Created by sail on 2017/6/11. + */ + + var handle = { + // 图片手势初始监测 + touchStart: function touchStart(e) { + var self = this; + var _e$touches = slicedToArray(e.touches, 2), + touch0 = _e$touches[0], + touch1 = _e$touches[1]; + + console.log(JSON.stringify(touch1)); + if(!touch0.x){ + touch0.x=touch0.clientX; + touch0.y=touch0.clientY; + if(touch1){ + touch1.x=touch1.clientX; + touch1.y=touch1.clientY; + } + } + + setTouchState(self, true, null, null + + //计算第一个触摸点的位置，并参照改点进行缩放 + ); + self.__oneTouchStart(touch0 + + // 两指手势触发 + ); + if (e.touches.length >= 2) { + self.__twoTouchStart(touch0, touch1); + } + }, + + + // 图片手势动态缩放 + touchMove: function touchMove(e) { + var self = this; + + var _e$touches2 = slicedToArray(e.touches, 2), + touch0 = _e$touches2[0], + touch1 = _e$touches2[1]; + if(!touch0.x){ + touch0.x=touch0.clientX; + touch0.y=touch0.clientY; + if(touch1){ + touch1.x=touch1.clientX; + touch1.y=touch1.clientY; + } + } + setTouchState(self, null, true + + // 单指手势时触发 + ); + if (e.touches.length === 1) { + self.__oneTouchMove(touch0); + } + // 两指手势触发 + if (e.touches.length >= 2) { + self.__twoTouchMove(touch0, touch1); + } + }, + touchEnd: function touchEnd(e) { + var self = this; + + setTouchState(self, false, false, true); + self.__xtouchEnd(); + } + }; + + /** + * Created by sail on 1017/6/12. + */ + function cut() { + var self = this; + var deviceRadio = self.deviceRadio; + + var boundWidth = self.width; // 裁剪框默认宽度，即整个画布宽度 + var boundHeight = self.height; + // 裁剪框默认高度，即整个画布高度 + var _self$cut = self.cut, + _self$cut$x = _self$cut.x, + x = _self$cut$x === undefined ? 0 : _self$cut$x, + _self$cut$y = _self$cut.y, + y = _self$cut$y === undefined ? 0 : _self$cut$y, + _self$cut$width = _self$cut.width, + width = _self$cut$width === undefined ? boundWidth : _self$cut$width, + _self$cut$height = _self$cut.height, + height = _self$cut$height === undefined ? boundHeight : _self$cut$height; + + /** + * 设置边界 + * @param imgLeft 图片左上角横坐标值 + * @param imgTop 图片左上角纵坐标值 + */ + + self.outsideBound = function(imgLeft, imgTop) { + self.imgLeft = imgLeft >= x ? x : self.scaleWidth + imgLeft - x <= width ? x + width - self.scaleWidth : imgLeft; + + self.imgTop = imgTop >= y ? y : self.scaleHeight + imgTop - y <= height ? y + height - self.scaleHeight : imgTop; + }; + + /** + * 设置边界样式 + * @param color 边界颜色 + */ + self.setBoundStyle = function() { + var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}, + _ref$color = _ref.color, + color = _ref$color === undefined ? '#04b00f' : _ref$color, + _ref$mask = _ref.mask, + mask = _ref$mask === undefined ? 'rgba(0, 0, 0, 0.3)' : _ref$mask, + _ref$lineWidth = _ref.lineWidth, + lineWidth = _ref$lineWidth === undefined ? 1 : _ref$lineWidth; + + // 绘制半透明层 + self.ctx.beginPath(); + self.ctx.setFillStyle(mask); + self.ctx.fillRect(0, 0, x, boundHeight); + self.ctx.fillRect(x, 0, width, y); + self.ctx.fillRect(x, y + height, width, boundHeight - y - height); + self.ctx.fillRect(x + width, 0, boundWidth - x - width, boundHeight); + self.ctx.fill + + // 设置边界左上角样式 + // 为使边界样式处于边界外边缘，此时x、y均要减少lineWidth + (); + self.ctx.beginPath(); + self.ctx.setStrokeStyle(color); + self.ctx.setLineWidth(lineWidth); + self.ctx.moveTo(x - lineWidth, y + 10 - lineWidth); + self.ctx.lineTo(x - lineWidth, y - lineWidth); + self.ctx.lineTo(x + 10 - lineWidth, y - lineWidth); + self.ctx.stroke + + // 设置边界左下角样式 + // 为使边界样式处于边界外边缘，此时x要减少lineWidth、y要增加lineWidth + (); + self.ctx.beginPath(); + self.ctx.setStrokeStyle(color); + self.ctx.setLineWidth(lineWidth); + self.ctx.moveTo(x - lineWidth, y + height - 10 + lineWidth); + self.ctx.lineTo(x - lineWidth, y + height + lineWidth); + self.ctx.lineTo(x + 10 - lineWidth, y + height + lineWidth); + self.ctx.stroke + + // 设置边界右上角样式 + // 为使边界样式处于边界外边缘，此时x要增加lineWidth、y要减少lineWidth + (); + self.ctx.beginPath(); + self.ctx.setStrokeStyle(color); + self.ctx.setLineWidth(lineWidth); + self.ctx.moveTo(x + width - 10 + lineWidth, y - lineWidth); + self.ctx.lineTo(x + width + lineWidth, y - lineWidth); + self.ctx.lineTo(x + width + lineWidth, y + 10 - lineWidth); + self.ctx.stroke + + // 设置边界右下角样式 + // 为使边界样式处于边界外边缘，此时x、y均要增加lineWidth + (); + self.ctx.beginPath(); + self.ctx.setStrokeStyle(color); + self.ctx.setLineWidth(lineWidth); + self.ctx.moveTo(x + width + lineWidth, y + height - 10 + lineWidth); + self.ctx.lineTo(x + width + lineWidth, y + height + lineWidth); + self.ctx.lineTo(x + width - 10 + lineWidth, y + height + lineWidth); + self.ctx.stroke(); + }; + } + + var __version__ = '1.1.4'; + + var weCropper = function() { + function weCropper(params) { + classCallCheck(this, weCropper); + + var self = this; + var _default = {}; + + validator(self, DEFAULT); + + Object.keys(DEFAULT).forEach(function(key) { + _default[key] = DEFAULT[key].default; + }); + Object.assign(self, _default, params); + + self.prepare(); + self.attachPage(); + self.createCtx(); + self.observer(); + self.cutt(); + self.methods(); + self.init(); + self.update(); + + return self; + } + + createClass(weCropper, [{ + key: 'init', + value: function init() { + var self = this; + var src = self.src; + + + self.version = __version__; + + typeof self.onReady === 'function' && self.onReady(self.ctx, self); + + if (src) { + self.pushOrign(src); + } + setTouchState(self, false, false, false); + + self.oldScale = 1; + self.newScale = 1; + + return self; + } + }]); + return weCropper; + }(); + + Object.assign(weCropper.prototype, handle); + + + weCropper.prototype.prepare = prepare; + weCropper.prototype.observer = observer; + weCropper.prototype.methods = methods; + weCropper.prototype.cutt = cut; + weCropper.prototype.update = update; + + return weCropper; + +}))); \ No newline at end of file diff --git a/pages/tabbar/index/comp/coachItem.vue b/pages/tabbar/index/comp/coachItem.vue index 4fafc3b..e84b6e4 100644 --- a/pages/tabbar/index/comp/coachItem.vue +++ b/pages/tabbar/index/comp/coachItem.vue @@ -7,7 +7,7 @@ {{ item.name}} - {{ item.schoolName }} + {{ item.schoolName }} - 优质驾校 + 风采驾校 @@ -188,6 +188,7 @@ informa: 1, coachList: [],//推荐教练 recommendSchool: [],//推荐驾校 + sweixin:null } }, async onLoad() { @@ -230,6 +231,7 @@ }, methods: { + async getLatLngFn() { await this.$store.dispatch('getCity') this.recommendSchoolList() @@ -328,15 +330,7 @@ url: '/pages/userCenter/login/loginByPhone' }) }, - initFn() { - uni.requestSubscribeMessage({ - tmplIds: ['0yaIdyI9NlHvGYwb3IIaIQq6uBhulYGN-rGVnJk4hZ4'], - success(res) { - console.log('消息是否有权限呢') - console.log(res) - } - }) - } + } } @@ -489,4 +483,14 @@ display: flex; margin: 20rpx 0; } + + .swiper-box { + .swiper-item { + .imgBox { + width: 100%; + height: 300rpx; + display: block; + } + } + } \ No newline at end of file diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue index c66bc70..e9b8fef 100644 --- a/pages/tabbar/mine/index.vue +++ b/pages/tabbar/mine/index.vue @@ -23,7 +23,6 @@ {{ vuex_userInfo.phone }} - @@ -47,6 +46,8 @@ + + @@ -83,7 +84,12 @@ if(this.show) this.show = false }, methods: { - + gotk() { + this.$store.commit('updateWebVeiwUrl', 'http://192.168.1.94:1314/h5#/pages/exercises/brushQuestions/brushQuestions') + uni.navigateTo({ + url: '/pages/indexEntry/webView/webView' + }) + }, topClick() { if(!this.vuex_userInfo.phone) { this.$goPage('/pages/userCenter/login/login') @@ -124,4 +130,4 @@ \ No newline at end of file + diff --git a/store/modules/user.js b/store/modules/user.js index a208c0f..cbd3dd5 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -95,12 +95,7 @@ const user = { const http = uni.$u.http let config = { custom: { auth: false }, header: {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'} } const res = await http.get('app/student-record/get') - // if(res.tenantId) { - // uni.$u.http.setConfig((config) => { - // config.header['tenant-id'] = res.tenantId - // return config - // }) - // } + if(!res) return commit('update_vuex_userInfo',res.data) }, // 刷新token