chore: 更新.gitignore，停止追踪忽略文件

更新manifest.json中的版本号至1.2.82
修改开发环境baseUrl配置
修复结算页金额显示格式并调整底部操作栏z-index

.gitignore

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

.hbuilderx/launch.json

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

config/baseUrl.js

@@ -6,8 +6,8 @@ if (process.env.NODE_ENV === 'development') {
 	baseUrl = "http://192.168.110.100:9200/pb/"; //  张川川
 } else if (process.env.NODE_ENV === 'production') {
 	//生产环境
-	// 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/"; //  张川川
 }
 const courtConfig = {
 	//微信公众号APPID

manifest.json

@@ -12,8 +12,9 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.2.75",
+    "sassImplementationName" : "node-sass",
-    "versionCode" : 1275,
+    "versionName" : "1.2.83",
+    "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/orderList.vue

@@ -5,8 +5,8 @@
 		<view class="header">
 			<!-- 顶部导航栏 -->
 			<z-nav-bar backState="2000" title="我的订单"></z-nav-bar>
-            <view class="ordersTabs">
+			<view class="ordersTabs">
-			    <view v-for="(item,index) in ordersTabs" @click="ordersTabCLi(item.value)" :key="index"
+				<view v-for="(item,index) in ordersTabs" @click="ordersTabCLi(item.value)" :key="index"
 				:class="ordersListTab==item.value?'ordersdefine ordStyle':'ordersdefine'">
 					{{item.name}}
 					<view class="ordersnum" v-if="item.value == 0 && map[item.value] > 0">{{map[item.value]}}</view>

pages/bookShop/settlement.vue

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

pages/peanut/home.vue

@@ -120,13 +120,13 @@
 
 		<scroll-view class="ProTabsBox">
 			<view class="New_ProTabs flexbox">
-				<text v-for="(item, index) in catTagList" :key="item.splId" :class="[tabsid == item.id ? 'cur' : '']"
+				<text v-for="(item, index) in catTagList" :key="item.splId" :class="[catTagIndex == index ? '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', curChildrenId == item.id ? 'cur' : '']"
+				<view @click="childrenChange(item, index)" :class="['item', curChildrenIndex == index ? 'cur' : '']"
 					v-for="(item, index) in childrenCatList" :key="item.id">
 					<text>{{ item.title }}</text>
 				</view>
@@ -347,6 +347,8 @@
 				yxCurIndex: 0, // 当前营销标签序号
 				SystemInfoSync: {}, // 屏幕尺寸
 				newsList: [], // 播报新闻列表
+				catTagIndex: 0,
+				curChildrenIndex: 0
 			};
 		},
 		onPageScroll(e) {
@@ -471,7 +473,7 @@
 			},
 			requestAll() {
 				this.getUserInfo();
-				this.tjProList = [];
+				// this.tjProList = [];
 				uni.hideTabBar();
 				// this.getData();
 				this.getTags();
@@ -529,7 +531,8 @@
 					// console.log(res, '营销标签列表')
 					if (res.result.length > 0) {
 						this.yingxiaoTags = res.result;
-						this.getYXproducts();
+						const item = this.yingxiaoTags.length > 0 && this.yingxiaoTags[this.yxCurIndex]
+						this.getYXproducts(item);
 					}
 
 					// console.log(res)
@@ -583,9 +586,11 @@
 							if (this.catTagList[0].isLast == 1) {
 								this.getJtData(this.catTagList[0].id);
 							} else {
-								this.childrenCatList = this.catTagList[0].children;
+								const currentCatTag = this.catTagList?.[this.catTagIndex];
-								this.curChildrenId = this.childrenCatList[0].id;
+								this.childrenCatList = currentCatTag.children.length > 0 ? currentCatTag.children : currentCatTag;
-								this.getJtData(this.childrenCatList[0].id);
+								this.curChildrenId = this.childrenCatList[this.curChildrenIndex]?.id || this.childrenCatList.id;
+								//this.getJtData(this.childrenCatList[this.curChildrenIndex]?.id);
+								this.getJtData(this.curChildrenId);
 							}
 						}
 					})
@@ -596,11 +601,13 @@
 			// 二级分类点击
 			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) {
@@ -609,6 +616,7 @@
 					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) {
@@ -1213,7 +1221,7 @@
 			color: #0e583a;
 			font-size: 34rpx;
 			line-height: 42rpx;
-			padding: 5px 10px;
+			padding: 10rpx 0 14rpx 10rpx;
 			font-weight: bold;
 			display: block;
 			width: 100%;
@@ -1222,6 +1230,7 @@
 			overflow: hidden;
 			text-align: center;
 			letter-spacing: 10rpx;
+			width: 3.5em;
 		}
 
 		text:last-child {