提交

.gitignore

@@ -1,5 +1,4 @@
 .DS_Store
-.hbuilderx/
 node_modules
 unpackage/dist
 unpackage/release

.hbuilderx/launch.json

@@ -0,0 +1,31 @@
+{
+    // 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-plus" : {
+                "launchtype" : "remote"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "h5" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "provider" : "aliyun",
+            "type" : "uniCloud"
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-ios"
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
+        }
+    ]
+}

config/baseUrl.js

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

manifest.json

@@ -12,9 +12,8 @@
             "src" : "图片路径"
         }
     ],
-    "sassImplementationName" : "node-sass",
+    "versionName" : "1.2.76",
-    "versionName" : "1.2.83",
+    "versionCode" : 1276,
-    "versionCode" : 1283,
     "app-plus" : {
         "compatible" : {
             "ignoreVersion" : true

pages/acupoint/givenDegree.vue

@@ -51,7 +51,7 @@
 				MonList: {
 					title: '阴经',
 					vlue: '属性',
-					attribute: ['阴经', '属性', '肺经(金)', '脾经(土)', '心(火)', '肾经(水)', '心包经(冬至前相火，冬至后相水)', '肝经(木)'],
+					attribute: ['阴经', '属性', '肺经(金)', '脾经(士)', '心(火)', '肾经(水)', '心包经(冬至前相火，冬至后相水)', '肝经(木)'],
 					arry: [
 						['井', '木', '少商', '隐白', '少冲(母穴)', '涌泉(子穴)', '中冲(冬至前母穴冬至后子穴)', '大敦(本穴)'],
 						['荥', '火', '鱼际', '大都(母穴)', '少府(本穴)', '然谷(泄井当泄荥)', '劳宫(冬至前本穴)', '行间(子穴)'],
@@ -66,12 +66,12 @@
 				SunList: {
 					title: '阳经',
 					vlue: '属性',
-					attribute: ['阳经', '属性', '大肠经(金)', '脾经(土)', '心(火)', '膀胱经(水)', '三焦经(冬至前相火,冬至后相水)', '胆经(木)'],
+					attribute: ['阳经', '属性', '大肠经(金)', '脾经(士)', '心(火)', '膀胱经(水)', '三焦经(冬至前相火,冬至后相水)', '胆经(木)'],
 					arry: [
 						['井', '金', '商阳(本穴)', '厉兑(子穴)', '少泽', '至阴(母穴)', '关冲(冬至后母穴)', '窍阴'],
 						['荥', '水', '二间(子穴)', '内庭(泄井当泄荥)', '前谷', '通谷(本穴)', '液门(冬至后本穴)', '侠溪(母穴)'],
 						['俞', '木', '三间', '陷谷', '后匾(母穴)', '束骨(子穴)', '中渚(冬至前回穴，冬至后子穴)', '临泣(本穴)'],
-						['经', '火', '阳溪', '解溪(母穴)', '阳谷(本穴)', '昆仑', '支沟(冬至前本穴)', '阳辅(子穴)'],
+						['经', '水', '阳溪', '解溪(母穴)', '阳谷(本穴)', '昆仑', '支沟(冬至前本穴)', '阳辅(子穴)'],
 						['合', '土', '曲池(母穴)', '足三里(本穴)', '小海(子穴)', '委中(补井当补合)', '天井(冬至前子穴)', '阳陵泉'],
 						['原', '', '合谷', '冲阳', '腕骨', '京骨', '阳池', '丘墟'],
 						['郄', '', '温溜', '梁丘', '养老', '金门', '会宗', '外丘'],

pages/bookShop/settlement.vue

@@ -245,7 +245,7 @@
         <span style="color: #666; margin-right: 10rpx; font-size: 15px"
           >实付款:
         </span>
-        {{ realPrice.toFixed(2) }}<span>天医币</span>
+        {{ realPrice }}<span>天医币</span>
       </view>
       <view class="operate" @click="goBuyJie" v-if="payType != 4">
         <view class="goBuy"> 立即支付 </view>
@@ -809,9 +809,8 @@ export default {
 
         //   }
         // }
-        price = (item.productAmount * item.price);
+        price = (item.productAmount * item.price).toFixed(2);
         allprice += Number(price);
-        allprice = parseFloat(allprice.toFixed(2));
       });
       this.totalPrice = allprice;
       // if (this.youhuiContent.id != undefined) {
@@ -938,7 +937,7 @@ export default {
         orderMoney: this.totalPrice, //订单金额
         vipDiscountAmount: this.vipPrice, //折扣金额
         districtMoney: this.districtAmount, //折扣金额
-        realMoney: this.realPrice.toFixed(2), //实收金额
+        realMoney: this.realPrice, //实收金额
         shippingMoney: this.farePrice, //运费
         couponId: youPre.id, //优惠券Id
         isSend: this.isSend,
@@ -1263,7 +1262,6 @@ export default {
   align-items: center;
   position: fixed;
   bottom: 0%;
-  z-index: 11;
 
   .commodityPrice {
     font-size: 40rpx;

pages/clock/index.vue

@@ -6,9 +6,9 @@
 				<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
 					已购图书
 				</view>
-				<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
+				<!-- <view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
 					推荐图书
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<!-- <view class="tip">

pages/comments/commentsList.vue

@@ -100,9 +100,9 @@
 					<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
 						已购图书
 					</view>
-					<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
+					<!-- <view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
 						推荐图书
-					</view>
+					</view> -->
 				</view>
 			</view>
 			<view v-if="bookList.length > 0">

pages/library/library.vue

@@ -34,9 +34,9 @@
 				<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
 					已购图书
 				</view>
-				<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
+				<!-- <view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
 					推荐图书
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="0" v-if="contentShow == 1">

pages/listen/home.vue

@@ -24,9 +24,9 @@
 				<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
 					已购图书
 				</view>
-				<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
+				<!-- <view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
 					推荐图书
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<view class="listenList" v-if="bookList.length > 0 || tjBookLIst.length > 0">

pages/peanut/home.vue

@@ -73,7 +73,7 @@
 				<!-- <text>讲 书</text> -->
 			</view>
 		</view>
-		<view class="search_box flexbox" @click="onPageJump('../peanut/searchFor')">
+		<!-- <view class="search_box flexbox" @click="onPageJump('../peanut/searchFor')">
 			<view class="search">
 				<text class="icon_search"></text>
 				<text class="prompt">请输入书名</text>
@@ -81,7 +81,7 @@
 			<view class="searBtn">
 				<text>书名检索</text>
 			</view>
-		</view>
+		</view> -->
 		<!-- 新闻播报 -->
 		<view class="fourBox" v-if="newsList.length > 0">
 			<view class="newsBox flexbox">
@@ -99,7 +99,7 @@
 			</view>
 		</view>
 		<!-- 营销标签 -->
-		<scroll-view class="yxTagBox" scroll-x="true">
+		<!-- <scroll-view class="yxTagBox" scroll-x="true">
 			<view class="ProTabs flexbox">
 				<text v-for="(item, index) in yingxiaoTags" :key="item.id" :class="[yxCurIndex == index ? 'cur' : '']"
 					@click="yxTabsChange(item, index)">{{ item.title }}</text>
@@ -120,21 +120,21 @@
 
 		<scroll-view class="ProTabsBox">
 			<view class="New_ProTabs flexbox">
-				<text v-for="(item, index) in catTagList" :key="item.splId" :class="[catTagIndex == index ? 'cur' : '']"
+				<text v-for="(item, index) in catTagList" :key="item.splId" :class="[tabsid == item.id ? 'cur' : '']"
 					@click="tabsChange(item, index)">{{ item.title }}</text>
 			</view>
 		</scroll-view>
 		<view class="children_cate_box" v-if="childrenCatList && childrenCatList.length > 0">
 			<view class="children_cate flexbox">
-				<view @click="childrenChange(item, index)" :class="['item', curChildrenIndex == index ? 'cur' : '']"
+				<view @click="childrenChange(item, index)" :class="['item', curChildrenId == item.id ? 'cur' : '']"
 					v-for="(item, index) in childrenCatList" :key="item.id">
 					<text>{{ item.title }}</text>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- 商品展示 -->
-		<view class="goods">
+		<!-- <view class="goods">
-			<!-- 精选 -->
+			
 			<view class="">
 				<view v-if="tjProList.length > 0">
 					<view class="flexbox" style="flex-wrap: wrap;">
@@ -150,7 +150,6 @@
 
 									<text v-if="item.is_vip_price==1&&item.vip_price!=0">
 									<text style="color: #e97512;font-size: 12px;font-weight: bold;">￥{{(item.vip_price).toFixed(2)}}</text>
-									<!-- <text style="color: #fa2d12;font-size: 10px;margin-left: 4px;">VIP到手价</text> -->
 									<text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(item.price).toFixed(2)}}</text>
 									
 									
@@ -160,7 +159,6 @@
 							<text
 								v-else-if="item.activity_price && item.activity_price > 0">
 								<text style="color: #e97512;font-size: 12px;font-weight: bold;">￥{{(item.activity_price).toFixed(2)}}</text>
-								<!-- <text style="color: #613804;font-size: 10px;margin-left: 4px;">活动价</text> -->
 									<text style="color: #8a8a8a;font-size: 10px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(item.price).toFixed(2)}}</text>
 									
 								
@@ -195,7 +193,7 @@
 				</view>
 				<u-divider v-else text="暂无数据哦~"></u-divider>
 			</view>
-		</view>
+		</view> -->
 
 		<view>
 			<u-back-top :scroll-top="scrollTop" bottom="60" :customStyle="bgiStyle" :iconStyle="iconStyle"></u-back-top>
@@ -347,8 +345,6 @@
 				yxCurIndex: 0, // 当前营销标签序号
 				SystemInfoSync: {}, // 屏幕尺寸
 				newsList: [], // 播报新闻列表
-				catTagIndex: 0,
-				curChildrenIndex: 0
 			};
 		},
 		onPageScroll(e) {
@@ -473,7 +469,7 @@
 			},
 			requestAll() {
 				this.getUserInfo();
-				// this.tjProList = [];
+				this.tjProList = [];
 				uni.hideTabBar();
 				// this.getData();
 				this.getTags();
@@ -531,8 +527,7 @@
 					// console.log(res, '营销标签列表')
 					if (res.result.length > 0) {
 						this.yingxiaoTags = res.result;
-						const item = this.yingxiaoTags.length > 0 && this.yingxiaoTags[this.yxCurIndex]
+						this.getYXproducts();
-						this.getYXproducts(item);
 					}
 
 					// console.log(res)
@@ -586,11 +581,9 @@
 							if (this.catTagList[0].isLast == 1) {
 								this.getJtData(this.catTagList[0].id);
 							} else {
-								const currentCatTag = this.catTagList?.[this.catTagIndex];
+								this.childrenCatList = this.catTagList[0].children;
-								this.childrenCatList = currentCatTag.children.length > 0 ? currentCatTag.children : currentCatTag;
+								this.curChildrenId = this.childrenCatList[0].id;
-								this.curChildrenId = this.childrenCatList[this.curChildrenIndex]?.id || this.childrenCatList.id;
+								this.getJtData(this.childrenCatList[0].id);
-								//this.getJtData(this.childrenCatList[this.curChildrenIndex]?.id);
-								this.getJtData(this.curChildrenId);
 							}
 						}
 					})
@@ -601,13 +594,11 @@
 			// 二级分类点击
 			childrenChange(item, index) {
 				// console.log(item,this.curChildrenId,'点击')
-				this.curChildrenIndex = index;
 				this.curChildrenId = this.childrenCatList[index].id;
 				this.getJtData(this.childrenCatList[index].id);
 			},
 			tabsChange(item, cindex) {
 				//	this.tjProList = []
-				this.catTagIndex = cindex;
 				this.tabsid = item.id;
 				this.childrenCatList = [];
 				if (this.catTagList[cindex].isLast == 1) {
@@ -616,7 +607,6 @@
 					this.childrenCatList = this.catTagList[cindex].children;
 					this.curChildrenId = this.childrenCatList[0].id;
 					this.getJtData(this.childrenCatList[0].id);
-					this.curChildrenIndex = 0
 				}
 				// this.getJtData()
 				// if (this.tabsid == 15) {
@@ -1221,7 +1211,7 @@
 			color: #0e583a;
 			font-size: 34rpx;
 			line-height: 42rpx;
-			padding: 10rpx 0 14rpx 10rpx;
+			padding: 5px 10px;
 			font-weight: bold;
 			display: block;
 			width: 100%;
@@ -1230,7 +1220,6 @@
 			overflow: hidden;
 			text-align: center;
 			letter-spacing: 10rpx;
-			width: 3.5em;
 		}
 
 		text:last-child {

pages/peanut/mine.vue

@@ -58,9 +58,9 @@
       <view class="nav_list" @click="onPageJump('../bookShop/orderList')">
         <text>我的订单</text>
       </view>
-      <view class="nav_list" @click="onPageJump('../peanut/shopping')">
+      <!-- <view class="nav_list" @click="onPageJump('../peanut/shopping')">
         <text>购物车</text>
-      </view>
+      </view> -->
       <view class="nav_list" @click="onPageJump('../user/persData')">
         <text>修改个人资料</text>
       </view>

pages/talkBook/talkBook.vue

@@ -9,9 +9,9 @@
 				<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
 					已购图书
 				</view>
-				<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
+				<!-- <view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
 					推荐图书
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<!-- <view class="tip">

pages/yian/yian.vue

@@ -12,9 +12,9 @@
 					<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
 						已购图书
 					</view>
-					<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
+					<!-- <view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
 						推荐图书
-					</view>
+					</view> -->
 				</view>
 			</view>
 			<view class="mainContainer">