diff --git a/config/baseUrl.js b/config/baseUrl.js index 685f98b..fbdb4ce 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -2,8 +2,8 @@ let baseUrl = ""; let socketUrl = ""; if (process.env.NODE_ENV === 'development') { // 开发环境 - // baseUrl = "https://api.nuttyreading.com/"; //线上正式' - baseUrl = "http://192.168.110.100:9200/pb/"; //张川川 + baseUrl = "https://api.nuttyreading.com/"; //线上正式' + // baseUrl = "http://192.168.110.100:9200/pb/"; //张川川 } else if (process.env.NODE_ENV === 'production') { // 生产环境11 baseUrl = "https://api.nuttyreading.com/"; //线上正式 diff --git a/manifest.json b/manifest.json index 7801877..5c6d47d 100644 --- a/manifest.json +++ b/manifest.json @@ -12,8 +12,8 @@ "src" : "图片路径" } ], - "versionName" : "2.0.40", - "versionCode" : 2040, + "versionName" : "2.0.42", + "versionCode" : 2042, "sassImplementationName" : "node-sass", "app-plus" : { "nvueCompiler" : "uni-app", @@ -66,7 +66,6 @@ "", "", "", - "", "", "", "", diff --git a/package-lock.json b/package-lock.json index de76583..674add9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "animate.css": "^4.1.1", "e-peanut": "file:", - "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.5", + "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.8", "element-plus": "^2.9.6", "epubjs": "^0.3.93", "jquery": "^2.2.4", @@ -24,7 +24,7 @@ "extraneous": true }, "../edu-core": { - "version": "1.0.4", + "version": "1.0.7", "extraneous": true, "license": "ISC", "devDependencies": {} @@ -441,8 +441,8 @@ "link": true }, "node_modules/edu-core": { - "version": "1.0.5", - "resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#4afd7e952360cf9d401a813fed9ce9e011e8fa76", + "version": "1.0.8", + "resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#a5f40fafc3935e886a3021b3a9ef49ed7ac13025", "license": "ISC" }, "node_modules/element-plus": { @@ -4179,7 +4179,7 @@ "requires": { "animate.css": "^4.1.1", "e-peanut": "file:", - "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.5", + "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.8", "element-plus": "^2.9.6", "epubjs": "^0.3.93", "jquery": "^2.2.4", @@ -4500,8 +4500,8 @@ } }, "edu-core": { - "version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#4afd7e952360cf9d401a813fed9ce9e011e8fa76", - "from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.5" + "version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#a5f40fafc3935e886a3021b3a9ef49ed7ac13025", + "from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.8" }, "element-plus": { "version": "2.11.5", @@ -7262,8 +7262,8 @@ } }, "edu-core": { - "version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#4afd7e952360cf9d401a813fed9ce9e011e8fa76", - "from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.5" + "version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#a5f40fafc3935e886a3021b3a9ef49ed7ac13025", + "from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.8" }, "element-plus": { "version": "2.11.5", diff --git a/package.json b/package.json index e39d0f7..2ea7dbc 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "animate.css": "^4.1.1", "e-peanut": "file:", - "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.5", + "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.8", "element-plus": "^2.9.6", "epubjs": "^0.3.93", "jquery": "^2.2.4", diff --git a/pages.json b/pages.json index 3ae8fb8..135cd9e 100644 --- a/pages.json +++ b/pages.json @@ -197,7 +197,7 @@ { "path": "pages/component/commonComponents/address/index", "style": { - "navigationBarTitleText": "收货地址", + "navigationBarTitleText": "收件地址", "enablePullDownRefresh": false, "app-plus": { "bounce": "none", @@ -209,7 +209,7 @@ { "path": "pages/component/commonComponents/address/edit", "style": { - "navigationBarTitleText": "收货地址详情", + "navigationBarTitleText": "收件地址详情", "enablePullDownRefresh": false, "app-plus": { "bounce": "none", diff --git a/pages/agreement/yszcPage.vue b/pages/agreement/yszcPage.vue index 601d1f3..70863a1 100644 --- a/pages/agreement/yszcPage.vue +++ b/pages/agreement/yszcPage.vue @@ -34,7 +34,7 @@ 1.2 您通过我们的服务进行通讯的信息,例如曾通讯的账号。 1.3 您通过我们的服务分享的内容所包含的信息(元数据),例如拍摄或上传的共享照片或录像的日期、时间或地点等。 2、位置信息,指您开启设备定位功能并使用我们基于位置提供的相关服务时,收集的有关您位置的信息,包括: - 2.1 您通过具有定位功能的移动设备使用我们的服务时,通过GPS或WiFi等方式收集的您的地理位置信息用于 健康超市收货 提供位置信息。 + 2.1 您通过具有定位功能的移动设备使用我们的服务时,通过GPS或WiFi等方式收集的您的地理位置信息用于 健康超市收件 提供位置信息。 2.2 您或其他用户提供的包含您所处地理位置的实时信息,例如您提供的账户信息中包含的您所在地区信息,您上传的显示您当前或曾经所处地理位置的共享信息,您或其他人共享的照片包含的地理标记信息。 diff --git a/pages/bookShop/bookShopType.vue b/pages/bookShop/bookShopType.vue index 8048a0d..13f038a 100644 --- a/pages/bookShop/bookShopType.vue +++ b/pages/bookShop/bookShopType.vue @@ -9,7 +9,7 @@ {{item.productName}} - (无货) + (无库存) diff --git a/pages/bookShop/commodityDetail copy.vue b/pages/bookShop/commodityDetail copy.vue index ee206b2..01514d8 100644 --- a/pages/bookShop/commodityDetail copy.vue +++ b/pages/bookShop/commodityDetail copy.vue @@ -19,7 +19,7 @@ {{productInfo.productName}} - (无货) + (无库存) 已售{{productInfo.sumSales}} diff --git a/pages/bookShop/commodityDetail.vue b/pages/bookShop/commodityDetail.vue index 1b6559e..a8e4f9e 100644 --- a/pages/bookShop/commodityDetail.vue +++ b/pages/bookShop/commodityDetail.vue @@ -24,7 +24,7 @@ {{ productInfo.productName }} - (无货) + (无库存) 已售{{ productInfo.sumSales }} diff --git a/pages/bookShop/deliverDetail.vue b/pages/bookShop/deliverDetail.vue index 664b372..0717cf2 100644 --- a/pages/bookShop/deliverDetail.vue +++ b/pages/bookShop/deliverDetail.vue @@ -104,9 +104,9 @@ if (this.orderContet.orderStatus == 0) { this.titleStat = '待支付' } else if (this.orderContet.orderStatus == 1) { - this.titleStat = '待发货' + this.titleStat = '待发出' } else if (this.orderContet.orderStatus == 2) { - this.titleStat = '待收货' + this.titleStat = '待收到' } else if (this.orderContet.orderStatus == 3) { this.titleStat = '已完成' } diff --git a/pages/bookShop/orderLCont.vue b/pages/bookShop/orderLCont.vue index eabff14..a784fe3 100644 --- a/pages/bookShop/orderLCont.vue +++ b/pages/bookShop/orderLCont.vue @@ -73,12 +73,12 @@ 待发货待发出 待收货待收到 @@ -599,7 +599,7 @@ plain type="success" /> - 发货时间:{{ item.createTime }} + 发出时间:{{ item.createTime }} @@ -771,7 +771,7 @@ export default { this.goPay(this.orderContet); } else if (data.text == "取消订单") { this.canceOrder(); - } else if (data.text == "确认收货") { + } else if (data.text == "确认收到") { this.OverOrder(); } else if (data.text == "查看物流") { this.seeExpressDetail(this.orderContet); @@ -1068,10 +1068,10 @@ export default { }); }, OverOrder() { - // 确认收货 + // 确认收到 uni.showModal({ title: "提示", - content: "确认收货?", + content: "确认收到?", success: (res) => { let data = { orderId: this.orderID, @@ -1093,7 +1093,7 @@ export default { if (res.code == 0) { uni.hideLoading(); uni.showToast({ - title: "收货成功", + title: "确认收到成功", icon: "success", duration: 1000, }); @@ -1174,7 +1174,7 @@ export default { if (this.orderContet.orderStatus == 2) { this.customButton.push({ width: "160rpx", - text: "确认收货", + text: "确认收到", color: "#fff", }); @@ -1209,9 +1209,9 @@ export default { if (this.orderContet.orderStatus == 0) { this.titleStat = "待支付"; } else if (this.orderContet.orderStatus == 1) { - this.titleStat = "待发货"; + this.titleStat = "待发出"; } else if (this.orderContet.orderStatus == 2) { - this.titleStat = "待收货"; + this.titleStat = "待收到"; } else if (this.orderContet.orderStatus == 3) { this.titleStat = "已完成"; } diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue index c1905e2..9900e96 100644 --- a/pages/bookShop/orderList.vue +++ b/pages/bookShop/orderList.vue @@ -89,12 +89,12 @@ 待发货待发出 已发货已发出 催发货催发出 确认收货确认收到 { // 订单状态 // * 0: 待付款 - // * 1: 待发货 - // * 2: 已发货 + // * 1: 待发出 + // * 2: 待收到 // * 3:已完成 // * 4: 交易失败 // * 5: 已过期 @@ -872,7 +872,7 @@ export default { var params = { userId: this.userInfo.id, come: this.come, - orderStatus: flag == -1 ? "" : flag, //传null为全部,订单状态 0-未付款 1-待发货 2-已发货 3-交易成功 4-交易失败 5-过期 + orderStatus: flag == -1 ? "" : flag, //传null为全部,订单状态 0-未付款 1-待发出 2-待收到 3-交易成功 4-交易失败 5-过期 ...this.pagination, // limit: 10, // page: this.newestpage, @@ -1062,11 +1062,11 @@ export default { }); // } }, - // 确认收货 + // 确认收到 OverOrder(item) { uni.showModal({ title: "提示", - content: "确认收货?", + content: "确认收到?", success: (res) => { let data = { orderId: item.orderId, @@ -1088,7 +1088,7 @@ export default { if (res.code == 0) { uni.hideLoading(); uni.showToast({ - title: "收货成功", + title: "确认收到成功", icon: "success", duration: 1000, }); diff --git a/pages/bookShop/settlement.vue b/pages/bookShop/settlement.vue index 353ae7a..0330a61 100644 --- a/pages/bookShop/settlement.vue +++ b/pages/bookShop/settlement.vue @@ -5,7 +5,7 @@ - 请添加收货地址 + 请添加收件地址 @@ -68,7 +68,7 @@ - 注:如订单包含一种或多种预售书,预售书和现货书需分开发货(即需要收取多次快递首重费用);如多本书会按照实际重量,收取快递续重费用。 + 注:如订单包含一种或多种预售书,预售书和现售书需分开发出(即需要收取多次快递首重费用);如多本书会按照实际重量,收取快递续重费用。 @@ -616,8 +616,8 @@ let data = { buyType: this.typeId, //0- 商品页直接下单 1- 购物车结算 userId: this.userInfo.id, //下单人ID - shippingUser: this.adressMoRen.consigneeName, //收货人姓名 - userPhone: this.adressMoRen.consigneePhone, //收货人手机号 + shippingUser: this.adressMoRen.consigneeName, //收件人姓名 + userPhone: this.adressMoRen.consigneePhone, //收件人手机号 // province: this.adressMoRen.areaidpathtext.split(' ')[0], //省 // city: this.adressMoRen.areaidpathtext.split(' ')[1], //市 diff --git a/pages/bookShop/settlementBook.vue b/pages/bookShop/settlementBook.vue index 286ab23..7bb84fd 100644 --- a/pages/bookShop/settlementBook.vue +++ b/pages/bookShop/settlementBook.vue @@ -5,7 +5,7 @@ - 请添加收货地址 + 请添加收件地址 @@ -606,8 +606,8 @@ let data = { buyType: this.typeId, //0- 商品页直接下单 1- 购物车结算 userId: this.userInfo.id, //下单人ID - shippingUser: this.adressMoRen.username, //收货人姓名 - userPhone: this.adressMoRen.userphone, //收货人手机号 + shippingUser: this.adressMoRen.username, //收件人姓名 + userPhone: this.adressMoRen.userphone, //收件人手机号 province: this.adressMoRen.areaidpathtext.split(' ')[0], //省 city: this.adressMoRen.areaidpathtext.split(' ')[1], //市 district: this.adressMoRen.areaidpathtext.split(' ')[2], //区 diff --git a/pages/component/commonComponents/address/edit.vue b/pages/component/commonComponents/address/edit.vue index d90c912..10a5823 100644 --- a/pages/component/commonComponents/address/edit.vue +++ b/pages/component/commonComponents/address/edit.vue @@ -5,7 +5,7 @@ --> - + @@ -20,7 +20,7 @@ - 默认收货地址 + 默认收件地址 diff --git a/pages/component/commonComponents/address/index.vue b/pages/component/commonComponents/address/index.vue index 66f5e1a..3767434 100644 --- a/pages/component/commonComponents/address/index.vue +++ b/pages/component/commonComponents/address/index.vue @@ -12,7 +12,7 @@ > @@ -128,7 +128,7 @@ import { mapState } from "vuex"; export default { components: { courseDescription, //课程说明 - editAddress, //编辑收货地址 + editAddress, //编辑收件地址 }, props: ["backState", "type"], data() { @@ -161,7 +161,7 @@ export default { customButtonGroup1: [ { with: 200, - text: "+ 添加收货地址", + text: "+ 添加收件地址", backgroundColor: "linear-gradient(90deg, #3C77BE 0%,#258feb 100%)", color: "#fff", }, diff --git a/pages/component/commonComponents/orderSubmit.vue b/pages/component/commonComponents/orderSubmit.vue index 70e0fbf..cd8c42c 100644 --- a/pages/component/commonComponents/orderSubmit.vue +++ b/pages/component/commonComponents/orderSubmit.vue @@ -25,7 +25,7 @@ - 请添加收货地址 + 请添加收件地址 @@ -241,6 +241,13 @@ + + + + + 注:如订单包含一种或多种预售书,预售书和现售书需分开发出(即需要收取多次快递首重费用);如多本书会按照实际重量,收取快递续重费用。 + + \ No newline at end of file diff --git a/pages/mine/mine/index.vue b/pages/mine/mine/index.vue index 65a9dc9..4b914d2 100644 --- a/pages/mine/mine/index.vue +++ b/pages/mine/mine/index.vue @@ -232,6 +232,11 @@ url: "/pages/component/commonComponents/address/index?type=mine", type: "pageJump", }, + { + name: "分享APP", + url: "", + type: "share", + }, { name: "关于我们", url: "/pages/mine/aboutUs/index", @@ -618,7 +623,6 @@ width: 100%; position: relative; margin-top: 50rpx; - align-items: center; display: flex; align-items: center; @@ -626,7 +630,7 @@ width: 120rpx; height: 120rpx; border-radius: 100rpx; - margin: 0 0 0 0; + margin: 0; float: left; } @@ -874,7 +878,6 @@ .bg_top { padding: 0 10rpx 0 20rpx; padding-top: 80rpx; - margin-bottom: 60rpx; } .setIcon { @@ -969,7 +972,7 @@ } .user_vip_box{ width: 125rpx; - position: absolute; + position: relative; margin-top: - 40rpx; z-index: 99; } @@ -996,6 +999,7 @@ .vip_type{ display: flex; align-items: center; + flex-wrap: wrap; } .vip_type_item{ display: flex; @@ -1010,6 +1014,7 @@ font-weight: bold; color: #fff; margin-right: 8rpx; + margin-bottom: 8rpx; } .vip_type_item_len{ padding: 0 7rpx; diff --git a/pages/mine/wallet/recharge/index.vue b/pages/mine/wallet/recharge/index.vue index c466309..2c276e3 100644 --- a/pages/mine/wallet/recharge/index.vue +++ b/pages/mine/wallet/recharge/index.vue @@ -593,7 +593,7 @@ let that = this; let data = { userId: that.userInfo.id, //下单人ID - userPhone: that.userInfo.tel, //收货人手机号 + userPhone: that.userInfo.tel, //收件人手机号 paymentMethod: that.payType, //2支付宝,1微信,3ios内购 orderMoney: that.stepsCj.money * 1, //订单金额 districtMoney: 0, //优惠金额 diff --git a/pages/miniClass/classInfo.vue b/pages/miniClass/classInfo.vue index 18691af..8072250 100644 --- a/pages/miniClass/classInfo.vue +++ b/pages/miniClass/classInfo.vue @@ -320,6 +320,9 @@ 等待评分 + + 评分中 + 分数:{{item.score}} @@ -372,9 +375,12 @@ 已不可作答