Skip to content

A
aimeiyue-xcx-user
Commit 86165ed8 by xnn
Options

修复已知问题

parent 8b452bee
Showing with 93 additions and 66 deletions
amy/pages/login/login.vue
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
<!-- 授权登录按钮 --> <!-- 授权登录按钮 -->
<u-button type="primary" open-type="getPhoneNumber" @getphonenumber="getphonenumber" shape="circle" <u-button type="primary" open-type="getPhoneNumber" @getphonenumber="getphonenumber" shape="circle"
color="#D3195E" text="授权登录"></u-button> color="#D3195E" text="授权登录"></u-button>
<u-gap height="20" bgColor="#fff"></u-gap>
<u-button type="primary" :plain="true" open-type="getPhoneNumber" @click="goback" shape="circle"
color="#D3195E" text="返回首页"></u-button>
</view> </view>
</view> </view>
...@@ -45,6 +48,11 @@ ...@@ -45,6 +48,11 @@
} }
}, },
methods: { methods: {
goback() {
uni.switchTab({
url: '/pages/index/index'
})
},
// 请求code方法 // 请求code方法
wxlogin() { wxlogin() {
console.log("执行login方法") console.log("执行login方法")
......
amy/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
amy/unpackage/dist/dev/mp-weixin/common/runtime.js
...@@ -104,46 +104,7 @@ ...@@ -104,46 +104,7 @@
/******/ var promises = []; /******/ var promises = [];
/******/ /******/
/******/ /******/
/******/ // mini-css-extract-plugin CSS loading
/******/ var cssChunks = {"components/my-locationback/my-locationback":1,"node-modules/uview-ui/components/u-cell-group/u-cell-group":1,"node-modules/uview-ui/components/u-cell/u-cell":1,"node-modules/uview-ui/components/u-list-item/u-list-item":1,"node-modules/uview-ui/components/u-list/u-list":1,"node-modules/uview-ui/components/u-sticky/u-sticky":1,"node-modules/uview-ui/components/u-swiper/u-swiper":1,"components/my-tabbar/my-tabbar":1,"node-modules/uview-ui/components/u-toast/u-toast":1,"node-modules/uview-ui/components/u-button/u-button":1,"node-modules/uview-ui/components/u-icon/u-icon":1,"node-modules/uview-ui/components/u-number-box/u-number-box":1,"components/my-baseNar/my-baseNar":1,"node-modules/uview-ui/components/u-empty/u-empty":1,"node-modules/uview-ui/components/u-tabs/u-tabs":1,"node-modules/uview-ui/components/u-parse/u-parse":1,"components/my-backNar/my-backNar":1,"node-modules/uview-ui/components/u-gap/u-gap":1,"node-modules/uview-ui/components/u-upload/u-upload":1,"node-modules/uview-ui/components/u-rate/u-rate":1,"node-modules/uview-ui/components/u-popup/u-popup":1,"node-modules/uview-ui/components/u-picker/u-picker":1,"node-modules/uview-ui/components/u-line/u-line":1,"node-modules/uview-ui/components/u-loading-icon/u-loading-icon":1,"node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator":1,"node-modules/uview-ui/components/u-tabbar-item/u-tabbar-item":1,"node-modules/uview-ui/components/u-tabbar/u-tabbar":1,"node-modules/uview-ui/components/u-overlay/u-overlay":1,"node-modules/uview-ui/components/u-badge/u-badge":1,"node-modules/uview-ui/components/u-input/u-input":1,"node-modules/uview-ui/components/u-parse/node/node":1,"node-modules/uview-ui/components/u-textarea/u-textarea":1,"node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom":1,"node-modules/uview-ui/components/u-status-bar/u-status-bar":1,"node-modules/uview-ui/components/u-transition/u-transition":1,"node-modules/uview-ui/components/u-toolbar/u-toolbar":1};
/******/ if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
/******/ else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
/******/ promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
/******/ var href = "" + ({"components/my-locationback/my-locationback":"components/my-locationback/my-locationback","node-modules/uview-ui/components/u-cell-group/u-cell-group":"node-modules/uview-ui/components/u-cell-group/u-cell-group","node-modules/uview-ui/components/u-cell/u-cell":"node-modules/uview-ui/components/u-cell/u-cell","node-modules/uview-ui/components/u-list-item/u-list-item":"node-modules/uview-ui/components/u-list-item/u-list-item","node-modules/uview-ui/components/u-list/u-list":"node-modules/uview-ui/components/u-list/u-list","node-modules/uview-ui/components/u-sticky/u-sticky":"node-modules/uview-ui/components/u-sticky/u-sticky","node-modules/uview-ui/components/u-swiper/u-swiper":"node-modules/uview-ui/components/u-swiper/u-swiper","components/my-tabbar/my-tabbar":"components/my-tabbar/my-tabbar","node-modules/uview-ui/components/u-toast/u-toast":"node-modules/uview-ui/components/u-toast/u-toast","node-modules/uview-ui/components/u-button/u-button":"node-modules/uview-ui/components/u-button/u-button","node-modules/uview-ui/components/u-icon/u-icon":"node-modules/uview-ui/components/u-icon/u-icon","node-modules/uview-ui/components/u-number-box/u-number-box":"node-modules/uview-ui/components/u-number-box/u-number-box","components/my-baseNar/my-baseNar":"components/my-baseNar/my-baseNar","node-modules/uview-ui/components/u-empty/u-empty":"node-modules/uview-ui/components/u-empty/u-empty","node-modules/uview-ui/components/u-tabs/u-tabs":"node-modules/uview-ui/components/u-tabs/u-tabs","node-modules/uview-ui/components/u--input/u--input":"node-modules/uview-ui/components/u--input/u--input","node-modules/uview-ui/components/u-parse/u-parse":"node-modules/uview-ui/components/u-parse/u-parse","components/my-backNar/my-backNar":"components/my-backNar/my-backNar","node-modules/uview-ui/components/u-gap/u-gap":"node-modules/uview-ui/components/u-gap/u-gap","node-modules/uview-ui/components/u-upload/u-upload":"node-modules/uview-ui/components/u-upload/u-upload","node-modules/uview-ui/components/u--textarea/u--textarea":"node-modules/uview-ui/components/u--textarea/u--textarea","node-modules/uview-ui/components/u-rate/u-rate":"node-modules/uview-ui/components/u-rate/u-rate","node-modules/uview-ui/components/u-popup/u-popup":"node-modules/uview-ui/components/u-popup/u-popup","node-modules/uview-ui/components/u-picker/u-picker":"node-modules/uview-ui/components/u-picker/u-picker","node-modules/uview-ui/components/u-line/u-line":"node-modules/uview-ui/components/u-line/u-line","node-modules/uview-ui/components/u-loading-icon/u-loading-icon":"node-modules/uview-ui/components/u-loading-icon/u-loading-icon","node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator":"node-modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator","node-modules/uview-ui/components/u-tabbar-item/u-tabbar-item":"node-modules/uview-ui/components/u-tabbar-item/u-tabbar-item","node-modules/uview-ui/components/u-tabbar/u-tabbar":"node-modules/uview-ui/components/u-tabbar/u-tabbar","node-modules/uview-ui/components/u-overlay/u-overlay":"node-modules/uview-ui/components/u-overlay/u-overlay","node-modules/uview-ui/components/u-badge/u-badge":"node-modules/uview-ui/components/u-badge/u-badge","node-modules/uview-ui/components/u-input/u-input":"node-modules/uview-ui/components/u-input/u-input","node-modules/uview-ui/components/u-parse/node/node":"node-modules/uview-ui/components/u-parse/node/node","node-modules/uview-ui/components/u-textarea/u-textarea":"node-modules/uview-ui/components/u-textarea/u-textarea","node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom":"node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom","node-modules/uview-ui/components/u-status-bar/u-status-bar":"node-modules/uview-ui/components/u-status-bar/u-status-bar","node-modules/uview-ui/components/u-transition/u-transition":"node-modules/uview-ui/components/u-transition/u-transition","node-modules/uview-ui/components/u-toolbar/u-toolbar":"node-modules/uview-ui/components/u-toolbar/u-toolbar"}[chunkId]||chunkId) + ".wxss";
/******/ var fullhref = __webpack_require__.p + href;
/******/ var existingLinkTags = document.getElementsByTagName("link");
/******/ for(var i = 0; i < existingLinkTags.length; i++) {
/******/ var tag = existingLinkTags[i];
/******/ var dataHref = tag.getAttribute("data-href") || tag.getAttribute("href");
/******/ if(tag.rel === "stylesheet" && (dataHref === href || dataHref === fullhref)) return resolve();
/******/ }
/******/ var existingStyleTags = document.getElementsByTagName("style");
/******/ for(var i = 0; i < existingStyleTags.length; i++) {
/******/ var tag = existingStyleTags[i];
/******/ var dataHref = tag.getAttribute("data-href");
/******/ if(dataHref === href || dataHref === fullhref) return resolve();
/******/ }
/******/ var linkTag = document.createElement("link");
/******/ linkTag.rel = "stylesheet";
/******/ linkTag.type = "text/css";
/******/ linkTag.onload = resolve;
/******/ linkTag.onerror = function(event) {
/******/ var request = event && event.target && event.target.src || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
/******/ err.request = request;
/******/ delete installedCssChunks[chunkId]
/******/ linkTag.parentNode.removeChild(linkTag)
/******/ reject(err);
/******/ };
/******/ linkTag.href = fullhref;
/******/ /******/
/******/ var head = document.getElementsByTagName("head")[0];
/******/ head.appendChild(linkTag);
/******/ }).then(function() {
/******/ installedCssChunks[chunkId] = 0;
/******/ }));
/******/ }
/******/ /******/
/******/ // JSONP chunk loading for javascript /******/ // JSONP chunk loading for javascript
/******/ /******/
......
amy/unpackage/dist/dev/mp-weixin/common/vendor.js
...@@ -446,13 +446,14 @@ var isIOS = false; ...@@ -446,13 +446,14 @@ var isIOS = false;
var deviceWidth = 0; var deviceWidth = 0;
var deviceDPR = 0; var deviceDPR = 0;
function checkDeviceWidth() { function checkDeviceWidth() {
var _Object$assign = Object.assign({}, wx.getWindowInfo(), { var windowWidth, pixelRatio, platform;
platform: wx.getDeviceInfo().platform {
}), var windowInfo = typeof wx.getWindowInfo === 'function' && wx.getWindowInfo() ? wx.getWindowInfo() : wx.getSystemInfoSync();
windowWidth = _Object$assign.windowWidth, var deviceInfo = typeof wx.getDeviceInfo === 'function' && wx.getDeviceInfo() ? wx.getDeviceInfo() : wx.getSystemInfoSync();
pixelRatio = _Object$assign.pixelRatio, windowWidth = windowInfo.windowWidth;
platform = _Object$assign.platform; // uni=>wx runtime 编译目标是 uni 对象，内部不允许直接使用 uni pixelRatio = windowInfo.pixelRatio;
platform = deviceInfo.platform;
}
deviceWidth = windowWidth; deviceWidth = windowWidth;
deviceDPR = pixelRatio; deviceDPR = pixelRatio;
isIOS = platform === 'ios'; isIOS = platform === 'ios';
...@@ -488,7 +489,7 @@ var messages = {}; ...@@ -488,7 +489,7 @@ var messages = {};
function getLocaleLanguage() { function getLocaleLanguage() {
var localeLanguage = ''; var localeLanguage = '';
{ {
var appBaseInfo = wx.getAppBaseInfo(); var appBaseInfo = typeof wx.getAppBaseInfo === 'function' && wx.getAppBaseInfo() ? wx.getAppBaseInfo() : wx.getSystemInfoSync();
var language = appBaseInfo && appBaseInfo.language ? appBaseInfo.language : LOCALE_EN; var language = appBaseInfo && appBaseInfo.language ? appBaseInfo.language : LOCALE_EN;
localeLanguage = normalizeLocale(language) || LOCALE_EN; localeLanguage = normalizeLocale(language) || LOCALE_EN;
} }
...@@ -747,6 +748,43 @@ function addSafeAreaInsets(result) { ...@@ -747,6 +748,43 @@ function addSafeAreaInsets(result) {
}; };
} }
} }
function getOSInfo(system, platform) {
var osName = '';
var osVersion = '';
if (platform && "mp-weixin" === 'mp-baidu') {
osName = platform;
osVersion = system;
} else {
osName = system.split(' ')[0] || platform;
osVersion = system.split(' ')[1] || '';
}
osName = osName.toLocaleLowerCase();
switch (osName) {
case 'harmony': // alipay
case 'ohos': // weixin
case 'openharmony':
// feishu
osName = 'harmonyos';
break;
case 'iphone os':
// alipay
osName = 'ios';
break;
case 'mac': // weixin qq
case 'darwin':
// feishu
osName = 'macos';
break;
case 'windows_nt':
// feishu
osName = 'windows';
break;
}
return {
osName: osName,
osVersion: osVersion
};
}
function populateParameters(result) { function populateParameters(result) {
var _result$brand = result.brand, var _result$brand = result.brand,
brand = _result$brand === void 0 ? '' : _result$brand, brand = _result$brand === void 0 ? '' : _result$brand,
...@@ -768,12 +806,9 @@ function populateParameters(result) { ...@@ -768,12 +806,9 @@ function populateParameters(result) {
var extraParam = {}; var extraParam = {};
// osName osVersion // osName osVersion
var osName = ''; var _getOSInfo = getOSInfo(system, platform),
var osVersion = ''; osName = _getOSInfo.osName,
{ osVersion = _getOSInfo.osVersion;
osName = system.split(' ')[0] || '';
osVersion = system.split(' ')[1] || '';
}
var hostVersion = version; var hostVersion = version;
// deviceType // deviceType
...@@ -805,9 +840,9 @@ function populateParameters(result) { ...@@ -805,9 +840,9 @@ function populateParameters(result) {
appVersion: "1.0.0", appVersion: "1.0.0",
appVersionCode: "100", appVersionCode: "100",
appLanguage: getAppLanguage(hostLanguage), appLanguage: getAppLanguage(hostLanguage),
uniCompileVersion: "4.57", uniCompileVersion: "4.66",
uniCompilerVersion: "4.57", uniCompilerVersion: "4.66",
uniRuntimeVersion: "4.57", uniRuntimeVersion: "4.66",
uniPlatform: undefined || "mp-weixin", uniPlatform: undefined || "mp-weixin",
deviceBrand: deviceBrand, deviceBrand: deviceBrand,
deviceModel: model, deviceModel: model,
...@@ -913,9 +948,9 @@ var getAppBaseInfo = { ...@@ -913,9 +948,9 @@ var getAppBaseInfo = {
hostTheme: theme, hostTheme: theme,
isUniAppX: false, isUniAppX: false,
uniPlatform: undefined || "mp-weixin", uniPlatform: undefined || "mp-weixin",
uniCompileVersion: "4.57", uniCompileVersion: "4.66",
uniCompilerVersion: "4.57", uniCompilerVersion: "4.66",
uniRuntimeVersion: "4.57" uniRuntimeVersion: "4.66"
})); }));
} }
}; };
...@@ -923,14 +958,23 @@ var getDeviceInfo = { ...@@ -923,14 +958,23 @@ var getDeviceInfo = {
returnValue: function returnValue(result) { returnValue: function returnValue(result) {
var _result2 = result, var _result2 = result,
brand = _result2.brand, brand = _result2.brand,
model = _result2.model; model = _result2.model,
_result2$system = _result2.system,
system = _result2$system === void 0 ? '' : _result2$system,
_result2$platform = _result2.platform,
platform = _result2$platform === void 0 ? '' : _result2$platform;
var deviceType = getGetDeviceType(result, model); var deviceType = getGetDeviceType(result, model);
var deviceBrand = getDeviceBrand(brand); var deviceBrand = getDeviceBrand(brand);
useDeviceId(result); useDeviceId(result);
var _getOSInfo2 = getOSInfo(system, platform),
osName = _getOSInfo2.osName,
osVersion = _getOSInfo2.osVersion;
result = sortObject(Object.assign(result, { result = sortObject(Object.assign(result, {
deviceType: deviceType, deviceType: deviceType,
deviceBrand: deviceBrand, deviceBrand: deviceBrand,
deviceModel: model deviceModel: model,
osName: osName,
osVersion: osVersion
})); }));
} }
}; };
......
amy/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-tabbar-item/u-tabbar-item.json
{ {
"component": true,
"usingComponents": { "usingComponents": {
"u-icon": "/node-modules/uview-ui/components/u-icon/u-icon", "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
"u-badge": "/node-modules/uview-ui/components/u-badge/u-badge" "u-badge": "/node-modules/uview-ui/components/u-badge/u-badge"
} },
"component": true
} }
\ No newline at end of file
amy/unpackage/dist/dev/mp-weixin/pages/login/login.js
...@@ -109,6 +109,9 @@ try { ...@@ -109,6 +109,9 @@ try {
uButton: function () { uButton: function () {
return Promise.all(/*! import() | node-modules/uview-ui/components/u-button/u-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-button/u-button")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-button/u-button.vue */ 459)) return Promise.all(/*! import() | node-modules/uview-ui/components/u-button/u-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-button/u-button")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-button/u-button.vue */ 459))
}, },
uGap: function () {
return Promise.all(/*! import() | node-modules/uview-ui/components/u-gap/u-gap */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-gap/u-gap")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-gap/u-gap.vue */ 522))
},
} }
} catch (e) { } catch (e) {
if ( if (
...@@ -201,6 +204,9 @@ exports.default = void 0; ...@@ -201,6 +204,9 @@ exports.default = void 0;
// //
// //
// //
//
//
//
var _default = { var _default = {
data: function data() { data: function data() {
return { return {
...@@ -225,6 +231,11 @@ var _default = { ...@@ -225,6 +231,11 @@ var _default = {
} }
}, },
methods: { methods: {
goback: function goback() {
uni.switchTab({
url: '/pages/index/index'
});
},
// 请求code方法 // 请求code方法
wxlogin: function wxlogin() { wxlogin: function wxlogin() {
console.log("执行login方法"); console.log("执行login方法");
......
amy/unpackage/dist/dev/mp-weixin/pages/login/login.json
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
"usingComponents": { "usingComponents": {
"u-icon": "/node-modules/uview-ui/components/u-icon/u-icon", "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
"u-toast": "/node-modules/uview-ui/components/u-toast/u-toast", "u-toast": "/node-modules/uview-ui/components/u-toast/u-toast",
"u-button": "/node-modules/uview-ui/components/u-button/u-button" "u-button": "/node-modules/uview-ui/components/u-button/u-button",
"u-gap": "/node-modules/uview-ui/components/u-gap/u-gap"
} }
} }
\ No newline at end of file
amy/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
<view class="content"><image class="logo" src="/static/logo.png"></image><view class="getUserInfoModel"><view class="privacyAgreement"><block wx:if="{{isAgree}}"><u-icon vue-id="35a7246c-1" name="http://amy.yyinhong.cn/uploads/wximg/loginxz.png" data-event-opts="{{[['^click',[['e0']]]]}}" bind:click="__e" bind:__l="__l"></u-icon></block><block wx:if="{{!isAgree}}"><u-icon vue-id="35a7246c-2" color="#D3195E" name="http://amy.yyinhong.cn/uploads/wximg/loginc.png" data-event-opts="{{[['^click',[['e1']]]]}}" bind:click="__e" bind:__l="__l"></u-icon></block><view class="privacyAgreementtext">阅读并同意<label data-event-opts="{{[['tap',[['previewWechat',['https://amyapi.yyinhong.cn/uploads/yonghu.docx']]]]]}}" catchtap="__e" class="_span">《用户协议》</label>及<label data-event-opts="{{[['tap',[['previewWechat',['https://amyapi.yyinhong.cn/uploads/yinsi.docx']]]]]}}" catchtap="__e" class="_span">《隐私协议》</label></view></view><u-toast class="vue-ref" vue-id="35a7246c-3" data-ref="uToast" bind:__l="__l"></u-toast><u-button vue-id="35a7246c-4" type="primary" open-type="getPhoneNumber" shape="circle" color="#D3195E" text="授权登录" data-event-opts="{{[['^getphonenumber',[['getphonenumber']]]]}}" bind:getphonenumber="__e" bind:__l="__l"></u-button></view></view> <view class="content"><image class="logo" src="/static/logo.png"></image><view class="getUserInfoModel"><view class="privacyAgreement"><block wx:if="{{isAgree}}"><u-icon vue-id="35a7246c-1" name="http://amy.yyinhong.cn/uploads/wximg/loginxz.png" data-event-opts="{{[['^click',[['e0']]]]}}" bind:click="__e" bind:__l="__l"></u-icon></block><block wx:if="{{!isAgree}}"><u-icon vue-id="35a7246c-2" color="#D3195E" name="http://amy.yyinhong.cn/uploads/wximg/loginc.png" data-event-opts="{{[['^click',[['e1']]]]}}" bind:click="__e" bind:__l="__l"></u-icon></block><view class="privacyAgreementtext">阅读并同意<label data-event-opts="{{[['tap',[['previewWechat',['https://amyapi.yyinhong.cn/uploads/yonghu.docx']]]]]}}" catchtap="__e" class="_span">《用户协议》</label>及<label data-event-opts="{{[['tap',[['previewWechat',['https://amyapi.yyinhong.cn/uploads/yinsi.docx']]]]]}}" catchtap="__e" class="_span">《隐私协议》</label></view></view><u-toast class="vue-ref" vue-id="35a7246c-3" data-ref="uToast" bind:__l="__l"></u-toast><u-button vue-id="35a7246c-4" type="primary" open-type="getPhoneNumber" shape="circle" color="#D3195E" text="授权登录" data-event-opts="{{[['^getphonenumber',[['getphonenumber']]]]}}" bind:getphonenumber="__e" bind:__l="__l"></u-button><u-gap vue-id="35a7246c-5" height="20" bgColor="#fff" bind:__l="__l"></u-gap><u-button vue-id="35a7246c-6" type="primary" plain="{{true}}" open-type="getPhoneNumber" shape="circle" color="#D3195E" text="返回首页" data-event-opts="{{[['^click',[['goback']]]]}}" bind:click="__e" bind:__l="__l"></u-button></view></view>
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment