提交

manifest.json

@@ -6,14 +6,12 @@
 		"request": 3000
 	},
 	"transformPx": false,
-    "icons" : [
+	"icons": [{
-        {
 		"sizes": "分辨率，192x192",
 		"src": "图片路径"
-        }
+	}],
-    ],
+	"versionName": "1.0.29",
-    "versionName" : "1.0.28",
+	"versionCode": 1029,
-    "versionCode" : 1028,
 	"app-plus": {
 		"nvueCompiler": "weex",
 		"compatible": {
@@ -270,4 +268,3 @@
 	}
 }
 // 小程序特有相关
-

pages/bookShop/orderLCont.vue

@@ -137,9 +137,16 @@
                   >
                 </view>
                 <view
-                  style="color: #c0c4cc; font-size: 26rpx; font-weight: 700"
+                  style="color: #e97512; font-size: 26rpx; font-weight: 700"
                 >
-                  ×{{ item.quantity ? item.quantity : "" }}</view
+                <view style="text-align: right;font-size: 30rpx;margin-bottom: 10rpx;">
+                   ￥{{ item.price }}
+                </view>
+               
+                <view style="text-align: right;color: #333;">
+                   ×{{ item.quantity ? item.quantity : "" }}
+                </view>
+                 </view
                 >
               </view>
               <!-- <view class="btns flexbox" style="margin-top: 10rpx">
@@ -1423,12 +1430,12 @@ uni-view {
 
       margin: 10rpx 0;
       // padding: 30rpx 0 0 0;
-      font-size: 28rpx;
+      font-size: 30rpx;
     }
 
     .orderReal {
       text-align: right;
-      font-size: 28rpx;
+      font-size: 30rpx;
       margin: 10rpx 0;
       // padding: 28rpx 0 0 0;
     }
@@ -1436,7 +1443,7 @@ uni-view {
     .orderYunf {
       text-align: right;
 
-      font-size: 28rpx;
+      font-size: 30rpx;
     }
 
     .orderOper {
@@ -1448,7 +1455,7 @@ uni-view {
         padding: 10rpx 0;
         display: inline-block;
         width: 160rpx;
-        font-size: 25rpx;
+        font-size: 30rpx;
         text-align: center;
       }
 

pages/component/commonComponents/list.vue

@@ -153,7 +153,7 @@ export default {
 }
 
 .titleItem {
-  width: calc(100% - 30rpx);
+  width: calc(100% );
   justify-content: space-between;
 }
 

pages/courseInformation/index/index.vue

@@ -126,14 +126,15 @@
           ></rich-text>
         </view>
       </template>
-      <template slot="detail_vipRecord" slot-scope="slotProps">
+      <template slot="detail_vipRecord" slot-scope="slotProps"> <vip-record  v-if="currentCateIndex == 1"></vip-record>
-        <view style="padding: 20rpx">
+       
-          <rich-text
+         
+          <!-- <rich-text
             :nodes="slotProps.dataList | formatRichText"
             @click.stop="showPreview"
             :data-nodes="slotProps.dataList"
-          ></rich-text>
+          ></rich-text> -->
-        </view>
+        
       </template>
     </common-anchor-link>
   </view>
@@ -142,6 +143,7 @@
 <script>
 import courseDescription from "../price/courseDescription.vue";
 import price from "../price/index.vue";
+import vipRecord from "./vip.vue";
 import purchaseNotice from "../purchaseNotice/index.vue";
 import instructionsForUse from "../instructionsForUse/index.vue";
 import $http from "@/config/requestConfig.js";
@@ -152,6 +154,7 @@ export default {
     price, //课程价格
     instructionsForUse, //使用须知
     purchaseNotice, //使用须知
+    vipRecord, //使用须知
   },
   data() {
     return {
@@ -919,7 +922,7 @@ export default {
 /deep/.wrapper {
   background-color: $themeBgColor;
   .content_list {
-    padding: 20rpx 0;
+    // padding: 20rpx 0;
     background-color: rgba(255, 255, 255, 0.8) !important;
   }
 }

pages/courseInformation/index/vip.vue

@@ -0,0 +1,109 @@
+<template>
+     <page-meta
+    :page-font-size="$baseFontSize() + 'px'"
+    :root-font-size="$baseFontSize() + 'px'"
+  ></page-meta>
+	<view class="super_wrap">
+		
+		<view class="super_content">
+		
+			
+			<text class="super_title super_title_2" style="margin-top: 40rpx;">国学与心理学超级VIP</text>
+			<view class="super_con">
+				<text class="weight">课程价格：</text>一年<text class="bigred line">26504</text>元</br>
+				<text class="weight">超级VIP价格：</text>三年/四年<text class="bigred">4980/5980</text>元</br>
+				<text class="weight">延期价格：</text>一年/三年/四年<text class="bigred">1980/3980/4980</text>元</br>
+				<text class="weight">超级VIP权限：</text></br>
+				无限制观看众妙之门APP与吴门医述APP心理学板块任意课程；</br>
+				国学与心理学培训班报名享受<text class="bigred">8折</text>优惠；</br>
+				疯子读书APP购书享受<text class="bigred">8折</text>优惠。
+			</view>
+			
+			<text class="super_title">心理学VIP</text>
+			<view class="super_con">
+				<text class="weight">课程价格：</text>一年<text class="bigred line">7188</text>元</br>
+				<text class="weight">VIP价格：</text>三年/四年<text class="bigred">3980/4980</text>元</br>
+				<text class="weight">延期价格：</text>一年/三年/四年<text class="bigred">1600/2980/3980</text>元</br>
+				<text class="weight">VIP权限：</text></br>
+				无限制观看吴门医述APP心理学板块任意课程；</br>
+				心理学培训班报名享受<text class="bigred">9折</text>优惠；</br>
+				疯子读书APP购书享受<text class="bigred">9折</text>优惠。
+			</view>
+			
+			<text class="super_title">众妙之门（国学）VIP</text>
+			<view class="super_con">
+				<text class="weight">课程价格：</text>一年<text class="bigred line">19316</text>元</br>
+				<text class="weight">VIP价格：</text>三年/四年<text class="bigred">2480/2980</text>元</br>
+				<text class="weight">延期价格：</text>一年/三年/四年<text class="bigred">800/1980/2400</text>元</br>
+				<text class="weight">VIP权限：</text></br>
+				无限制观看众妙之门APP任意课程；</br>
+				国学培训班报名享受<text class="bigred">9折</text>优惠；</br>
+				疯子读书APP购书享受<text class="bigred">9折</text>优惠。
+			</view>
+		
+				</view>
+	</view>
+</template>
+
+<style lang="scss" scoped>
+@import '@/style/mixin.scss';
+.super_wrap{
+	height: auto;
+	background-color: #fdfcdf3d;
+    padding-bottom: 20rpx;
+    margin-bottom: 20px;
+}
+.super_content{
+	background-color: #fdfcdf3d;
+}
+.super_title{
+	height: 50rpx;
+	line-height: 50rpx;
+	display: inline-block;
+	font-size: 26rpx;
+	@include theme("btn_bg");
+	color: #fff;
+	padding: 0 15rpx;
+	border-radius: 15rpx;
+	margin: 15rpx 25rpx 15rpx;
+	font-weight: bold;
+}
+.super_title_2{
+	font-size: 32rpx;
+	height: 64rpx;
+	line-height: 64rpx;
+	margin: 50rpx 25rpx 20rpx;
+	padding: 0 20rpx;
+	background-image: linear-gradient(90deg, #ff1f00 0%, #fa9f93 100%);
+}
+.super_con{
+	display: block;
+	font-size: 28rpx;
+	line-height: 46rpx;
+	padding: 0rpx 25rpx 0;
+	letter-spacing: 1px;
+}
+.super_con2{
+	display: block;
+	line-height: 50rpx;
+	letter-spacing: 1px;
+	color: #666;
+	padding: 50rpx 25rpx 60rpx;
+}
+.bigred{
+	font-size: 34rpx;
+	color: red;
+	font-weight: bold;
+	padding: 0 3rpx;
+}
+.line{
+	text-decoration: line-through;
+	color: #258feb;
+	font-style: italic;
+}
+.weight{
+	display: line-block;
+	font-weight: bold;
+	color: #000;
+}
+</style>

pages/goods/index/index.vue

@@ -37,51 +37,75 @@
 
       <view class="goods_box">
         <view class="curriulum_title_box">
-          <view v-if="this.options.isMiaosha == 1" class="miaosha_box">
+          <view v-if="(curriculumData.isVipPrice == 1 &&
+                      curriculumData.vipPrice != 0 &&
+                      curriculumData.vipPrice != null)|| curriculumData.activityPrice &&
+                  curriculumData.activityPrice > 0" class="miaosha_box">
             <view class="price_box">
-              <view class="price_left">
+              <view class="price_left" v-if="curriculumData">
-                <template
+                
+                <text
+                class="price"
                 v-if="
-                    curriculumData.activityPrice &&
+                  curriculumData.isVipPrice == 1 &&
-                    curriculumData.activityPrice > 0
+                  curriculumData.vipPrice != 0 &&
+                  curriculumData.vipPrice != null
                 "
               >
-                  <text class="aui-text-danger price">
+                <text 
-                    ￥{{ curriculumData.activityPrice }}
+                  >￥{{ curriculumData.vipPrice.toFixed(2) }}</text
+                >
+                <!-- <text style="color: #fa2d12; font-size: 10px; margin-left: 4px"
+                >VIP到手价</text
+              > -->
+                <text
+                  style="
+                    color: #8a8a8a;
+                    font-size: 14px;
+                    margin-left: 4px;
+                    font-weight: bold;
+                    text-decoration: line-through;
+                  "
+                  >￥{{ Number(curriculumData.price).toFixed(2) }}</text
+                >
               </text>
-                  <text class="price original_price"
-                    >原价：￥{{ curriculumData.price }}
-                  </text>
-                </template>
-                <template v-else>
-                  <text class="aui-text-danger price">
-                    ￥{{ curriculumData.price }}
-                  </text>
-                </template>
 
+              <text
+                v-else-if="curriculumData.activityPrice && curriculumData.activityPrice > 0"
+                class="price"
+              >
+                <text 
+                  >￥{{ curriculumData.activityPrice.toFixed(2) }}</text
+                >
+                <!-- <text style="color: #613804; font-size: 10px; margin-left: 4px"
+                >活动价</text
+              > -->
+                <text
+                  style="
+                    color: #8a8a8a;
+                    font-size: 14px;
+                    margin-left: 4px;
+                    font-weight: bold;
+                    text-decoration: line-through;
+                  "
+                  >￥{{ Number(curriculumData.price).toFixed(2) }}</text
+                >
+              </text>
+
+              <text v-else-if="curriculumData&&curriculumData.price>0" class="price"
+                >￥{{ Number(curriculumData.price).toFixed(2) }}</text
+              >
                 <view class="price original_price sales_number"
                   >已售 {{ curriculumData.sumSales }}件
                 </view>
               </view>
 
               <view class="xianshimaiosha_box" >
-                <text
+                <text class="xianshimaiosha" v-if="curriculumData.isVipPrice == 1 &&
-                  class="xianshimaiosha"
-                  v-if="
-                    curriculumData.isVipPrice == 1 &&
                       curriculumData.vipPrice != 0 &&
-                    curriculumData.vipPrice != null
+                      curriculumData.vipPrice != null">VIP优惠</text>
-                  "
+                <text class="xianshimaiosha" v-else-if=" curriculumData.activityPrice &&
-                  >VIP优惠</text
+                  curriculumData.activityPrice > 0">活动立减</text>
-                >
-                <text
-                  class="xianshimaiosha"
-                  v-else-if="
-                    curriculumData.activityPrice &&
-                    curriculumData.activityPrice > 0
-                  "
-                  >活动立减</text
-                >
               </view>
             </view>
 
@@ -89,7 +113,12 @@
               >{{ curriculumData.productName }}
             </view>
           </view>
-          <view v-else class="normal_box">
+         
+          <view
+            v-else
+            class="normal_box"
+            style="padding-top: 10rpx; padding-bottom: 10rpx"
+          >
             <view class="price_box">
               <template
                 v-if="
@@ -104,9 +133,9 @@
                   >原价：￥{{ curriculumData.price }}
                 </text>
               </template>
-              <template v-else>
+              <template v-else-if="curriculumData.price">
                 <text class="aui-text-danger price">
-                  ￥{{ curriculumData.price }}
+                  ￥{{ Number(curriculumData.price).toFixed(2) }}
                 </text>
               </template>
               <text
@@ -116,7 +145,7 @@
               </text>
             </view>
 
-            <view class="curriulum_title" style="margin-top: 40rpx"
+            <view class="curriulum_title" style="margin-top: 20rpx"
               >{{ curriculumData.productName }}
             </view>
           </view>

pages/goods/order/index.vue

@@ -87,20 +87,11 @@
           <image class="goods_item_img" :src="v.productImages" mode="aspectFit">
           </image>
           <view class="normal_box">
-            <view class="normal_box_top" style="justify-content: space-between">
+            <view class="normal_box_top" style="height: auto;min-height: 100rpx;">
               <view
                 class="curriulum_title"
-                style="width: calc(100% - 160rpx); font-size: 14px"
+                style="width: calc(100%); font-size: 14px"
                 >{{ v.productName }}
-              </view>
-              <u-number-box
-                :min="1"
-                :input-width="30"
-                v-model="orderNumber"
-                button-size="20"
-              ></u-number-box>
-            </view>
-
                 <view>
               <text
                 v-if="
@@ -147,7 +138,20 @@
               <text v-else style="font-size: 14px"
                 >￥{{ Number(v.price).toFixed(2) }}</text
               >
+            </view> </view>
+              <!-- <uni-number-box
+                :min="1"
+                :step="1"
+                :positive-integer="true"
+                :input-width="30"
+                v-model="orderNumber"
+                button-size="20"
+                input-type="number"
+              /> -->
+           
             </view>
+ <uni-number-box v-model="orderNumber" :step="1"  :min="1" :width="18" style="float: right;"/>
+           
           </view>
         </view>
         <view class="pay_box" style="margin-top: 20rpx">
@@ -455,7 +459,7 @@
         <!-- leftSlot -->
         <template slot="leftSlot" slot-scope="slotProps">
           <view class="price_box order_bottom_box"
-            ><text class="number">共{{ number }}件</text>
+            ><text class="number">共{{ orderNumber }}件</text>
             <text class="price"
               >合计：
 
@@ -689,7 +693,7 @@ export default {
       },
       customButton: [
         {
-          width: "300rpx",
+          width: "250rpx",
           text: "立即支付",
           backgroundColor: "linear-gradient(90deg, #3AB3AE 0%, #117e4c 100%)",
           color: "#fff",
@@ -872,7 +876,7 @@ export default {
           if (res.code == 0) {
             console.log(
               "res.code at line 53899999999999999999999999999999999:",
-              res,
+              res
             );
             this.vipPrice = res.discountAmount;
             // console.log('需要的运费', res.result)
@@ -940,7 +944,7 @@ export default {
             this.jfNumber -
             this.districtAmount -
             this.vipPrice +
-            this.freightNum,
+            this.freightNum
         ).toFixed(2);
 
         if (this.actualPayment == 0) {
@@ -950,7 +954,7 @@ export default {
         }
         console.log(
           "this.isDefaultCurrency at line 692:",
-          this.isDefaultCurrency,
+          this.isDefaultCurrency
         );
         this.$forceUpdate();
       });
@@ -1204,22 +1208,21 @@ export default {
         } else {
           that.jfNumberShow = that.jfNumber.toFixed(2);
           that.actualPayment = Number(that.totalPrice - that.jfNumber).toFixed(
-            2,
+            2
           );
         }
         that.actualPayment = Number(
-          that.actualPayment +
+          that.totalPrice +
             that.freightNum -
             that.districtAmount -
-            that.vipPrice,
+            that.vipPrice
         ).toFixed(2);
       } else {
         that.actualPayment = Number(
           that.totalPrice +
             that.freightNum -
-            couponAmount -
             that.districtAmount -
-            that.vipPrice,
+            that.vipPrice
         ).toFixed(2);
       }
 
@@ -1259,7 +1262,7 @@ export default {
       this.orderModalShowInfo = v;
       console.log(
         "this.orderModalShowInfo at line 727:",
-        this.orderModalShowInfo,
+        this.orderModalShowInfo
       );
       this.orderModalShow = true;
       if (this.orderModalShowInfo.type == "remark") {
@@ -1411,7 +1414,7 @@ export default {
                         // 	});
                         // }, 1000)
                       }
-                    },
+                    }
                   );
                 } else if (this.payType == 1) {
                   // 微信支付
@@ -2420,7 +2423,7 @@ export default {
 /deep/.goods_nav_box {
   .left {
     margin-top: -10rpx;
-    width: calc(100% - 220rpx);
+    width: calc(100% - 180rpx);
     height: auto;
     position: relative;
     // overflow: hidden;

pages/homePage/index/index.vue

@@ -100,7 +100,7 @@
         </view>
       </view>
 
-      <view class="flash_sale_box" v-if="$platform != 'ios'">
+      <view class="flash_sale_box" >
         <view class="flash_sale_top">
           <image
             class="miaoShaIcon"

pages/mine/vip/index.vue

@@ -1,4 +1,8 @@
 <template>
+   <page-meta
+    :page-font-size="$baseFontSize() + 'px'"
+    :root-font-size="$baseFontSize() + 'px'"
+  ></page-meta>
   <view class="commonPageBox">
     <z-nav-bar title="VIP"></z-nav-bar>
     <view class="vip_block">