chore: 小班作业心得思考题等编辑框提示修改

- 将应用版本从2.0.46提升至2.0.47
- 更新edu-core依赖版本至1.0.10
- 在manifest.json中新增读取外部存储和媒体图片的权限
- 修改多个页面的文本提示以提高用户体验

.hbuilderx/launch.json

@@ -1,38 +0,0 @@
-{
-    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version" : "0.0",
-    "configurations" : [
-        {
-            "app" : {
-                "launchtype" : "remote"
-            },
-            "app-plus" : {
-                "launchtype" : "remote"
-            },
-            "default" : {
-                "launchtype" : "local"
-            },
-            "h5" : {
-                "launchtype" : "remote"
-            },
-            "mp-weixin" : {
-                "launchtype" : "local"
-            },
-            "provider" : "aliyun",
-            "type" : "uniCloud"
-        },
-        {
-            "playground" : "custom",
-            "type" : "uni-app:app-ios"
-        },
-        {
-            "playground" : "custom",
-            "type" : "uni-app:app-android"
-        },
-        {
-            "playground" : "standard",
-            "type" : "uni-app:app-ios_simulator"
-        }
-    ]
-}

config/baseUrl.js

@@ -2,6 +2,7 @@ let baseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
+	// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试
 	baseUrl = "https://api.nuttyreading.com/"; //线上正式'
 	// baseUrl = "http://192.168.110.100:9200/pb/"; //张川川
 } else if (process.env.NODE_ENV === 'production') {

manifest.json

@@ -12,8 +12,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "2.0.43",
+    "versionName" : "2.0.47",
-    "versionCode" : 2043,
+    "versionCode" : 2047,
     "sassImplementationName" : "node-sass",
     "app-plus" : {
         "nvueCompiler" : "uni-app",
@@ -63,6 +63,7 @@
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
@@ -70,6 +71,8 @@
                     "<uses-permission android:name=\"android.permission.INTERNET\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_MEDIA_IMAGES\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
                     "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",

package-lock.json

@@ -24,7 +24,7 @@
 			"extraneous": true
 		},
 		"../edu-core": {
-			"version": "1.0.7",
+			"version": "1.0.10",
 			"license": "ISC",
 			"devDependencies": {}
 		},

pages/component/commonComponents/orderSubmit.vue

@@ -519,6 +519,17 @@
           </view>
         </view>
       </u-popup>
+      <u-modal
+        :show="presaleRemarkModalShow"
+        title="提示"
+        :content="presaleRemarkModalContent"
+        :showCancelButton="true"
+        confirmText="继续购买"
+        cancelText="取消"
+        @confirm="handlePresaleRemarkConfirm"
+        @cancel="handlePresaleRemarkCancel"
+        @close="handlePresaleRemarkCancel"
+      ></u-modal>
     </view>
   </template>
   
@@ -616,6 +627,9 @@
   
         orderModalShowInfo: {},
         orderModalShow: false,
+        presaleRemarkModalShow: false,
+        presaleRemarkModalContent: "",
+        presaleRemarkModalResolve: null,
         payType: 1,
         freightNum: 0,
         addressData: {
@@ -1350,6 +1364,62 @@
           this.content = this.remark;
         }
       },
+      openPresaleRemarkModal(content) {
+        this.presaleRemarkModalContent = content;
+        this.presaleRemarkModalShow = true;
+        return new Promise((resolve) => {
+          this.presaleRemarkModalResolve = resolve;
+        });
+      },
+      handlePresaleRemarkConfirm() {
+        this.presaleRemarkModalShow = false;
+        if (this.presaleRemarkModalResolve) {
+          const resolve = this.presaleRemarkModalResolve;
+          this.presaleRemarkModalResolve = null;
+          resolve(true);
+        }
+      },
+      handlePresaleRemarkCancel() {
+        this.presaleRemarkModalShow = false;
+        if (this.presaleRemarkModalResolve) {
+          const resolve = this.presaleRemarkModalResolve;
+          this.presaleRemarkModalResolve = null;
+          resolve(false);
+        }
+      },
+      async checkPresaleRemark() {
+        if (this.pageType != "goods") {
+          return true;
+        }
+        const productIds = this.goodsDataList
+          .map((e) => e.productId)
+          .filter((id) => id)
+          .join(",");
+        if (!productIds || !this.urlList.presaleRemark) {
+          return true;
+        }
+        try {
+          const res = await this.$http.request({
+            url: `${this.urlList.presaleRemark}`,
+            method: "POST",
+            data: {
+              productIds,
+            },
+            header: {
+              "Content-Type": "application/json",
+            },
+          });
+          const remark =
+            res && typeof res.remark == "string" ? res.remark.trim() : "";
+          if (!remark) {
+            return true;
+          }
+          return await this.openPresaleRemarkModal(remark);
+        } catch (error) {
+          console.log("presaleRemark error:", error);
+          return true;
+        }
+      },
       async goBuyJie() {
         if (this.pageType == "vip") {
           if (this.radioValue != "1") {
@@ -1457,6 +1527,11 @@
           });
           thisproduct = thisproduct.join(",");
         }
+        const passPresaleRemark = await this.checkPresaleRemark();
+        if (!passPresaleRemark) {
+          this.buyingFlag = false;
+          return;
+        }
         if (
           this.historyOrderInfo &&
           thisproduct == this.historyOrderInfo.product &&

pages/course/chapterDetailAndorid.vue

@@ -17,7 +17,7 @@
 				<CommonCourseVideo
 					:video-list="videoArray"
 					:current-index="currentCateIndex !== null ? currentCateIndex : 0"
-					:course="{courseTitle:options.navTitle, chapterTitle: curriculumData.title}"
+					:course="{courseTitle:options.navTitle, chapterTitle: curriculumData.title, catalogueId: curriculumData.catalogueId || '', courseId: curriculumData.courseId || options.courseId || ''}"
 					:cover="options.curriculumImgUrl || ''"
 					:http="$http"
 				/>
@@ -120,7 +120,7 @@
 								<view class="page-body">
 									<view class='wrapper'>
 										<view class="editor-wrapper">
-											<editor @input="editorIput" id="editor" class="ql-container" placeholder="请输入您的见解..."
+											<editor @input="editorIput" id="editor" class="ql-container" placeholder="请您一次性提交答题内容，提交后会进入评分流程"
 												show-img-size show-img-toolbar show-img-resize
 												@statuschange="onStatusChange" :read-only="readOnly"
 												@ready="onEditorReady">
@@ -934,9 +934,9 @@
 	}
 
 
-	.u-grid-list {
+	// .u-grid-list {
-		// height: 40rpx;
+	// 	// height: 40rpx;
-	}
+	// }
 
 	.searchList {
 		.item {
@@ -1133,7 +1133,8 @@
 
 		button {
 			font-size: 32rpx;
-			@include theme('btn_bg') color: #fff;
+			@include theme('btn_bg');
+			color: #fff;
 			height: 80rpx;
 			line-height: 80rpx;
 			border-radius: 50rpx;
@@ -1236,11 +1237,11 @@
 		// align-items: center;
 	}
 
-	.headImage {
+	// .headImage {
-		// height: 400rpx !important;
+	// 	// height: 400rpx !important;
-	}
+	// }
 
-	.commonDetailPage {}
+	// .commonDetailPage {}
 
 	.curriulum_box {
 		margin-top: 20rpx;
@@ -1263,9 +1264,9 @@
 		}
 	}
 
-	/deep/.titleItem {
+	// /deep/.titleItem {
-		// width: calc(100% - 120rpx) !important;
+	// 	// width: calc(100% - 120rpx) !important;
-	}
+	// }
 
 	/deep/.scroll-view-item:nth-child(2n-1) {
 		background-color: transparent !important;
@@ -1396,7 +1397,7 @@
 		width: calc(100% - 150rpx) !important;
 
 		.aui-text-danger {
-			display: inline-block;
+			// display: inline-block;
 			float: right;
 		}
 	}

pages/course/courseDetail.vue

@@ -1308,7 +1308,7 @@
 						});
 						
 						const joinedText = this.textList.join('/');
-						this.goBuyTitle = '购买'+joinedText+'VIP，即可畅享更多专属权益';
+						this.goBuyTitle = '购买'+joinedText+'VIP，即可畅享更多专属权益(不包含论坛)';
 					}
 				})
 			},

pages/goods/order/index.vue

@@ -132,6 +132,7 @@ export default {
         list: "app/phone.do?getCourseDetail_new",
         initPrepareOrder: "common/buyOrder/initPrepareOrder",
         buyOrder: "book/buyOrder/placeOrder",
+        presaleRemark: "book/buyOrder/presaleRemark",
         curriculumInfo: "app/phone.do?getCourseInfo",
         detailInfo: "app/phoneDoctor.do?getTaiHuClassInfo_new",
         userInfo: "common/user/getUserInfo",

pages/mine/mine/index.vue

@@ -29,7 +29,12 @@
 				</view>
 				<view class="userInfoBox" style="margin-left: 20rpx;">
 					<template>
-						<view class="name">{{ userMes.nickname ? userMes.nickname : "未设置" }}</view>
+						<view class="name">
+							{{ userMes.nickname ? userMes.nickname : "未设置" }}
+							<text v-if="userMes.profile" class="user-profile">({{userMes.profile}})</text>
+						</view>
+						
+						<!-- <u-tag v-if="userMes.profile" :text="userMes.profile" size="mini" plain plainFill type="success"></u-tag> -->
 					</template>
 					<template v-if="userMes.tel">
 						<view class="phone">手机号：({{ userMes.tel }})</view>
@@ -41,6 +46,12 @@
 							</view>
 						</view>
 					</template>
+					<template>
+						<view>
+							<u-tag v-if="userMes.todayWatch" :text="userMes.todayWatch" size="mini" plain plainFill type="success" class="watch-time"></u-tag>
+							<u-tag v-if="userMes.totalWatch" :text="userMes.totalWatch" size="mini" plain plainFill class="watch-time"></u-tag>
+						</view>
+					</template>
 				</view>
 			</view>
 
@@ -128,13 +139,14 @@
 				<view class="xiugai boxShadow box_fillet">
 					<common-list :dataList="pageList" @hancleClick="handleClickTab" label="name">
 						<template slot="rightSlot" slot-scope="slotProps">
-              <text
+							<text
-                class="fdButtonBox aui-text-success"
+								v-if="slotProps.row.contentType&&slotProps.row.contentType == 'hufen'&&hufenNumber>0"
-                v-if="slotProps.row.contentType&&slotProps.row.contentType == 'hufen'&&hufenNumber>0"
+								class="fdButtonBox aui-text-success"
-                style="line-height: 40rpx; font-size: 40rpx;color: #258feb;float: right;"
+								style="line-height: 40rpx; font-size: 40rpx;color: #258feb;float: right;"
-                >{{ hufenNumber }}<text style="font-size: 30rpx;margin-left: 4rpx;">湖分</text></text
+							>
-              >
+								{{ hufenNumber }}<text style="font-size: 30rpx;margin-left: 4rpx;">湖分</text>
-            </template>
+							</text>
+						</template>
 					</common-list>
 				</view>
 			</view>
@@ -483,6 +495,9 @@
 				if (this.userInfo.id != undefined) {
 					this.$http.post("common/user/getUserInfo").then((res) => {
 						this.userMes = res.result;
+						this.userMes.profile = res.des || '';
+						this.userMes.todayWatch = res.todayWatch || '';
+						this.userMes.totalWatch = res.totalWatch || '';
 					});
 				}
 			},
@@ -636,15 +651,23 @@
 
 		view {
 			.name {
-				width: 100%;
+				width: 90%;
 				font-weight: bold;
 				font-size: 32rpx;
 				color: #6990c7 !important;
+				line-height: 1.2;
+			}
+			
+			.user-profile{
+				font-size: 28rpx;
+				font-weight: normal;
+				display: inline-block;
 			}
 
 			.phone {
 				font-size: 26rpx;
 				color: #6990c7 !important;
+				margin: 6rpx 0;
 			}
 
 			.per_user_img {
@@ -654,6 +677,12 @@
 				margin-left: 10rpx;
 				vertical-align: super;
 			}
+			
+			.watch-time {
+				margin-top: 6rpx;
+				display: inline-block;
+				margin-right: 10rpx;
+			}
 		}
 	}
 

pages/miniClass/addHomeWork.vue

@@ -46,9 +46,9 @@
 					<view class="in">
 						<view class="uni-textarea">
 							<textarea v-show="false" placeholder-style="font-size:26rpx" v-model="form.content"
-								 auto-height placeholder="请输入内容" />
+								 auto-height placeholder="请您一次性提交答题内容，提交后会进入评分流程" />
 							<view class="editor-wrapper">
-								<editor @input="editorIput" id="editor" class="ql-container" placeholder="请输入内容..." show-img-size
+								<editor @input="editorIput" id="editor" class="ql-container" placeholder="请您一次性提交答题内容，提交后会进入评分流程" show-img-size
 									show-img-toolbar show-img-resize @statuschange="onStatusChange"
 									:read-only="readOnly" @ready="onEditorReady">
 								</editor>

pages/miniClass/taskDetail.vue

@@ -111,7 +111,7 @@
 								<view class="in">
 									<view class="uni-textarea">
 										<textarea placeholder-style="font-size:26rpx" v-model="form.content" maxlength="-1"
-											auto-height placeholder="请输入内容" />
+											auto-height placeholder="请您一次性提交答题内容，提交后会进入评分流程" />
 				
 									</view>
 								</view>

pages/peanut/home.vue

@@ -642,11 +642,16 @@ export default {
     //存储的需要固定分类
     this.fixed = uni.getStorageSync("fixed");
     //固定分类
-    if (this.fixed) {
+    if (this.currentIndex === null || this.currentIndex === undefined) {
-      this.curseClick(this.currentItem, this.currentIndex);
-    } else {
       this.currentIndex = 0;
-      this.currentItem = null;
+    }
+    if (
+      this.fixed &&
+      this.currentItem &&
+      this.currentIndex !== null &&
+      this.currentIndex !== undefined
+    ) {
+      this.curseClick(this.currentItem, this.currentIndex);
     }
     uni.hideTabBar();
     // #ifdef APP-PLUS