Przeglądaj źródła

添加返回按钮,文字修改

sunkuosheng 3 lat temu
rodzic
commit
1128335537
35 zmienionych plików z 126 dodań i 37 usunięć
  1. 9 6
      pages/index/index.vue
  2. 18 0
      pages/paper/paper.vue
  3. 20 0
      pages/test/test.vue
  4. 1 1
      unpackage/dist/build/h5/index.html
  5. 1 1
      unpackage/dist/build/h5/static/js/chunk-vendors.87655e17.js
  6. 1 1
      unpackage/dist/build/h5/static/js/index.23f91ffe.js
  7. 1 0
      unpackage/dist/build/h5/static/js/pages-index-index.37a31a64.js
  8. 0 1
      unpackage/dist/build/h5/static/js/pages-index-index.505480d1.js
  9. 1 0
      unpackage/dist/build/h5/static/js/pages-paper-paper.10d8a82a.js
  10. 0 1
      unpackage/dist/build/h5/static/js/pages-paper-paper.aa621148.js
  11. 0 1
      unpackage/dist/build/h5/static/js/pages-test-test.2ac56b68.js
  12. 1 0
      unpackage/dist/build/h5/static/js/pages-test-test.52da3c6a.js
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-topTitle/uni-top.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/paper/paper.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/performance/performance.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/ranking/ranking.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/test/test.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  26. 1 1
      unpackage/dist/dev/mp-weixin/app.json
  27. 11 8
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  28. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  29. 7 0
      unpackage/dist/dev/mp-weixin/pages/paper/paper.js
  30. 1 1
      unpackage/dist/dev/mp-weixin/pages/paper/paper.wxml
  31. 11 0
      unpackage/dist/dev/mp-weixin/pages/paper/paper.wxss
  32. 9 0
      unpackage/dist/dev/mp-weixin/pages/test/test.js
  33. 1 1
      unpackage/dist/dev/mp-weixin/pages/test/test.wxml
  34. 11 0
      unpackage/dist/dev/mp-weixin/pages/test/test.wxss
  35. 7 0
      unpackage/dist/dev/mp-weixin/sitemap98.json

+ 9 - 6
pages/index/index.vue

@@ -57,12 +57,12 @@
 			</view>
 			<view class="phb" @click="toRanking">
 				<uni-icons type="flag" size="20" color="#FFFFFF"></uni-icons>
-				排行
+				排行
 			</view>
 			<view class="ckcj" @click="lookGrade" v-if="isUser">
 				<!-- v-if="uni.getStorageSync("user")" -->
 				<uni-icons type="flag" size="20" color="#FFFFFF"></uni-icons>
-				查看成绩
+				成绩
 			</view>
 			<!-- <view class="outLogin" @click="outLogin" v-if="isUser&&isH5">
 				<uni-icons type="arrow-left" size="20" color="#FFFFFF"></uni-icons>
@@ -368,11 +368,14 @@
 					this.isUser = false;
 				}
 			},
-			async phoneLogin(res) {
+			async phoneLogin(res,is) {
 				//卷子是否存在
 				
 				//防止重复登录 
-				if (!uni.getStorageSync("token") || !uni.getStorageSync("user")||res.is) {
+				if (!uni.getStorageSync("token") || !uni.getStorageSync("user")||is) {
+					console.log(!uni.getStorageSync("token"),'!uni.getStorageSync("token")');
+					console.log(!uni.getStorageSync("user"),'!uni.getStorageSync("user")');
+					console.log(res.is,'res.is');
 					uni.showLoading({
 						title: '加载中'
 					});
@@ -461,8 +464,8 @@
 						...res,
 						examId: this.htmlData.id,
 						openId: uni.getStorageSync("openId") ? uni.getStorageSync("openId") : null,
-						is:true
-					});
+						
+					},true);
 					this.$refs.popup.close()
 				}).catch(err => {
 					console.log('表单错误信息:', err);

+ 18 - 0
pages/paper/paper.vue

@@ -71,6 +71,10 @@
 				</view>
 			</view>
 		</view>
+		<view class="phb" @click="goHome">
+			<uni-icons type="home" size="20" color="#FFFFFF"></uni-icons>
+			返回
+		</view>
 		<view class="outLogin" @click="outLogin" v-if="isUser">
 			<uni-icons type="arrow-left" size="20" color="#FFFFFF"></uni-icons>
 			退出
@@ -138,6 +142,9 @@
 			}
 		},
 		methods: {
+			goHome() {
+				uni.navigateBack()
+			},
 			async unbindMiniOpenid() {
 				let res = {
 					examId: uni.getStorageSync("examData").id,
@@ -528,4 +535,15 @@
 		font-size: 25rpx;
 		color: #fff;
 	}
+	.phb {
+		position: fixed;
+		right: 0;
+		bottom: 14%;
+		display: flex;
+		background-color: rgb(245, 166, 35);
+		padding: 10rpx 10rpx 10rpx 30rpx;
+		border-radius: 30rpx 0 0 30rpx;
+		font-size: 25rpx;
+		color: #fff;
+	}
 </style>

+ 20 - 0
pages/test/test.vue

@@ -92,6 +92,10 @@
 				</view>
 			</view>
 		</uni-popup>
+		<view class="phb" @click="goHome">
+			<uni-icons type="home" size="20" color="#FFFFFF"></uni-icons>
+			返回
+		</view>
 		<view class="outLogin" @click="outLogin" v-if="isUser">
 			<uni-icons type="arrow-left" size="20" color="#FFFFFF"></uni-icons>
 			退出
@@ -278,6 +282,11 @@
 			}
 		},
 		methods: {
+			goHome() {
+				uni.navigateTo({
+					url: '/pages/index/index'
+				});
+			},
 			async unbindMiniOpenid() {
 				let res = {
 					examId: uni.getStorageSync("examData").id,
@@ -863,4 +872,15 @@
 		font-size: 25rpx;
 		color: #fff;
 	}
+	.phb {
+		position: fixed;
+		right: 0;
+		bottom: 14%;
+		display: flex;
+		background-color: rgb(245, 166, 35);
+		padding: 10rpx 10rpx 10rpx 30rpx;
+		border-radius: 30rpx 0 0 30rpx;
+		font-size: 25rpx;
+		color: #fff;
+	}
 </style>

Plik diff jest za duży
+ 1 - 1
unpackage/dist/build/h5/index.html


Plik diff jest za duży
+ 1 - 1
unpackage/dist/build/h5/static/js/chunk-vendors.87655e17.js


Plik diff jest za duży
+ 1 - 1
unpackage/dist/build/h5/static/js/index.23f91ffe.js


Plik diff jest za duży
+ 1 - 0
unpackage/dist/build/h5/static/js/pages-index-index.37a31a64.js


Plik diff jest za duży
+ 0 - 1
unpackage/dist/build/h5/static/js/pages-index-index.505480d1.js


Plik diff jest za duży
+ 1 - 0
unpackage/dist/build/h5/static/js/pages-paper-paper.10d8a82a.js


Plik diff jest za duży
+ 0 - 1
unpackage/dist/build/h5/static/js/pages-paper-paper.aa621148.js


Plik diff jest za duży
+ 0 - 1
unpackage/dist/build/h5/static/js/pages-test-test.2ac56b68.js


Plik diff jest za duży
+ 1 - 0
unpackage/dist/build/h5/static/js/pages-test-test.52da3c6a.js


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-topTitle/uni-top.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/paper/paper.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/performance/performance.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/ranking/ranking.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/test/test.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


+ 1 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -14,5 +14,5 @@
     "backgroundColor": "#F8F8F8"
   },
   "usingComponents": {},
-  "sitemapLocation": "sitemap7.json"
+  "sitemapLocation": "sitemap98.json"
 }

+ 11 - 8
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -561,16 +561,19 @@ var _getOpenId = _interopRequireDefault(__webpack_require__(/*! ../../utils/getO
                   _this.isUser = false;
                 }case 9:case "end":return _context2.stop();}}}, _callee2);}))();
     },
-    phoneLogin: function phoneLogin(res) {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee3() {var data, resd, _resd;return _regenerator.default.wrap(function _callee3$(_context3) {while (1) {switch (_context3.prev = _context3.next) {case 0:if (!(
+    phoneLogin: function phoneLogin(res, is) {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee3() {var data, resd, _resd;return _regenerator.default.wrap(function _callee3$(_context3) {while (1) {switch (_context3.prev = _context3.next) {case 0:if (!(
 
 
 
-                !uni.getStorageSync("token") || !uni.getStorageSync("user") || res.is)) {_context3.next = 14;break;}
+                !uni.getStorageSync("token") || !uni.getStorageSync("user") || is)) {_context3.next = 17;break;}
+                console.log(!uni.getStorageSync("token"), '!uni.getStorageSync("token")');
+                console.log(!uni.getStorageSync("user"), '!uni.getStorageSync("user")');
+                console.log(res.is, 'res.is');
                 uni.showLoading({
                   title: '加载中' });
 
-                console.log(res, 'res');_context3.next = 5;return (
-                  (0, _url.phoneLogin)(res));case 5:data = _context3.sent;
+                console.log(res, 'res');_context3.next = 8;return (
+                  (0, _url.phoneLogin)(res));case 8:data = _context3.sent;
                 console.log(data, 'data');
                 uni.hideLoading();
                 uni.setStorageSync("token", data.data.token.access_token);
@@ -596,7 +599,7 @@ var _getOpenId = _interopRequireDefault(__webpack_require__(/*! ../../utils/getO
 
                 } else {
                   _this2.starExam();
-                }_context3.next = 16;break;case 14:
+                }_context3.next = 19;break;case 17:
 
                 _resd = uni.getStorageSync("examFlg") == 1 && uni.getStorageSync("examData").id == uni.
                 getStorageSync("oldExamId") && uni.getStorageSync("user").loginName == uni.getStorageSync(
@@ -608,7 +611,7 @@ var _getOpenId = _interopRequireDefault(__webpack_require__(/*! ../../utils/getO
 
                 } else {
                   _this2.starExam();
-                }case 16:case "end":return _context3.stop();}}}, _callee3);}))();
+                }case 19:case "end":return _context3.stop();}}}, _callee3);}))();
 
 
     },
@@ -653,9 +656,9 @@ var _getOpenId = _interopRequireDefault(__webpack_require__(/*! ../../utils/getO
         _this5.phoneLogin(_objectSpread(_objectSpread({},
         res), {}, {
           examId: _this5.htmlData.id,
-          openId: uni.getStorageSync("openId") ? uni.getStorageSync("openId") : null,
-          is: true }));
+          openId: uni.getStorageSync("openId") ? uni.getStorageSync("openId") : null }),
 
+        true);
         _this5.$refs.popup.close();
       }).catch(function (err) {
         console.log('表单错误信息:', err);

Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


+ 7 - 0
unpackage/dist/dev/mp-weixin/pages/paper/paper.js

@@ -264,6 +264,10 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
 
 
 
@@ -328,6 +332,9 @@ var _url = __webpack_require__(/*! ../../utils/url.js */ 21);function _interopRe
 
   },
   methods: {
+    goHome: function goHome() {
+      uni.navigateBack();
+    },
     unbindMiniOpenid: function unbindMiniOpenid() {return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {var res, data;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
                 res = {
                   examId: uni.getStorageSync("examData").id,

Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/paper/paper.wxml


+ 11 - 0
unpackage/dist/dev/mp-weixin/pages/paper/paper.wxss

@@ -125,4 +125,15 @@
 	font-size: 25rpx;
 	color: #fff;
 }
+.phb.data-v-78527a40 {
+	position: fixed;
+	right: 0;
+	bottom: 14%;
+	display: flex;
+	background-color: rgb(245, 166, 35);
+	padding: 10rpx 10rpx 10rpx 30rpx;
+	border-radius: 30rpx 0 0 30rpx;
+	font-size: 25rpx;
+	color: #fff;
+}
 

+ 9 - 0
unpackage/dist/dev/mp-weixin/pages/test/test.js

@@ -286,6 +286,10 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
 
 
 
@@ -469,6 +473,11 @@ var _url = __webpack_require__(/*! ../../utils/url.js */ 21);function _interopRe
     }
   },
   methods: {
+    goHome: function goHome() {
+      uni.navigateTo({
+        url: '/pages/index/index' });
+
+    },
     unbindMiniOpenid: function unbindMiniOpenid() {return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {var res, data;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
                 res = {
                   examId: uni.getStorageSync("examData").id,

Plik diff jest za duży
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/test/test.wxml


+ 11 - 0
unpackage/dist/dev/mp-weixin/pages/test/test.wxss

@@ -133,4 +133,15 @@
 	font-size: 25rpx;
 	color: #fff;
 }
+.phb.data-v-3e202046 {
+	position: fixed;
+	right: 0;
+	bottom: 14%;
+	display: flex;
+	background-color: rgb(245, 166, 35);
+	padding: 10rpx 10rpx 10rpx 30rpx;
+	border-radius: 30rpx 0 0 30rpx;
+	font-size: 25rpx;
+	color: #fff;
+}
 

+ 7 - 0
unpackage/dist/dev/mp-weixin/sitemap98.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}