diff --git a/main.js b/main.js
index 9507107..7c19b02 100644
--- a/main.js
+++ b/main.js
@@ -45,6 +45,8 @@ uni.getSystemInfo({
 
 import commonList from '@/pages/component/commonComponents/list.vue'
 Vue.component('common-list', commonList);
+import commonOrderSubmit from '@/pages/component/commonComponents/orderSubmit.vue'
+Vue.component('common-order-submit', commonOrderSubmit);
 import commonVideoAliyun from '@/pages/component/commonComponents/video/AliPlayer.vue'
 Vue.component('common-list-aliyun', commonVideoAliyun);
 import commonVideoAudio from '@/pages/component/commonComponents/video/audio.vue'
diff --git a/manifest.json b/manifest.json
index 04d22bd..8f89498 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "心灵空间",
     "appid" : "__UNI__BBBDFD2",
     "description" : "心灵空间",
-    "versionName" : "1.0.28",
-    "versionCode" : 1028,
+    "versionName" : "1.0.32",
+    "versionCode" : 1032,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -48,9 +48,6 @@
                     "<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.INSTALL_PACKAGES\"/>",
                     "<uses-permission android:name=\"android.permission.INTERNET\"/>",
                     "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
                 ],
diff --git a/pages.json b/pages.json
index f087c8f..8d4d499 100644
--- a/pages.json
+++ b/pages.json
@@ -218,6 +218,30 @@
 				}
 			}
 		},
+		{
+			"path": "pages/trainingCourse/index",
+			"style": {
+				"navigationBarTitleText": "培训班管理",
+				"enablePullDownRefresh": false, // 禁止下拉刷新
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false,
+					"popGesture": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/trainingCourse/detail",
+			"style": {
+				"navigationBarTitleText": "培训班管理",
+				"enablePullDownRefresh": false, // 禁止下拉刷新
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false,
+					"popGesture": "none"
+				}
+			}
+		},
 		{
 			"path": "pages/my/persData",
 			"style": {
@@ -314,6 +338,18 @@
 				}
 			}
 		},
+		{
+			"path": "pages/goods/shopping",
+			"style": {
+				"navigationBarTitleText": "购物车",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false,
+					"popGesture": "none"
+				}
+			}
+		},
 		{
 			"path": "pages/place/order",
 			"style": {
diff --git a/pages/component/commonComponents/address/edit.vue b/pages/component/commonComponents/address/edit.vue
index e8b87ab..54c81b4 100644
--- a/pages/component/commonComponents/address/edit.vue
+++ b/pages/component/commonComponents/address/edit.vue
@@ -161,7 +161,7 @@
 								validateFunction: (rule, value, data, callback) => {
 									// 异步需要返回 Promise 对象
 									return new Promise((resolve, reject) => {
-										if (!this.$base.phoneRegular.test(value)) {
+										if (!/^\d{5,15}$/.test(value)) {
 											reject(new Error("手机号格式不正确"));
 										} else {
 											resolve();
diff --git a/pages/component/commonComponents/list.vue b/pages/component/commonComponents/list.vue
index e9068a3..002e81d 100644
--- a/pages/component/commonComponents/list.vue
+++ b/pages/component/commonComponents/list.vue
@@ -147,6 +147,7 @@ export default {
 
 .titleItem {
   width: calc(100%) !important;
+  position: relative;
 }
 
 /deep/.scroll-view-item:nth-child(2n-1) {
diff --git a/pages/component/commonComponents/orderCoupon.vue b/pages/component/commonComponents/orderCoupon.vue
new file mode 100644
index 0000000..b68a932
--- /dev/null
+++ b/pages/component/commonComponents/orderCoupon.vue
@@ -0,0 +1,388 @@
+<template>
+  <view>
+    <!-- 优惠券弹出 -->
+    <u-popup :show="youhuiShow" :round="10" @close="closePup">
+      <view class="tanchu">
+        <view class="dp_title">请选择优惠券</view>
+        <template v-if="list.length > 0">
+          <view style="max-height: 40vh; overflow-y: scroll">
+            <view v-for="(item, index) in list" :key="index">
+              <view
+                :class="`youhuiItem ${
+                  youhuiIndex === index ? ' youItem_style' : ''
+                } ${item.canUse === 0 ? 'disableSelect' : ''}`"
+                @click="choseYouhui(index)"
+                ><text
+                  class="border_radius_10"
+                  style="
+                    position: absolute;
+                    top: 10rpx;
+                    right: 10rpx;
+                    font-size: 25rpx;
+                    background-color: #ffe3e9;
+                    color: #c81346;
+                    padding: 6rpx;
+                  "
+                  >{{ item.couponEntity.couponRange | couponType }}</text
+                >
+                <view
+                  style="width: 25%; color: #ff0043; text-align: center"
+                  class="couponPrice"
+                >
+                  <text>￥</text>
+                  <b style="font-size: 45rpx">{{
+                    item.couponEntity.couponAmount
+                  }}</b>
+                  <text
+                    class="useLevel"
+                    style="
+                      display: block;
+                      color: #666;
+                      font-size: 25rpx;
+                      margin-top: 10rpx;
+                    "
+                    >满{{ item.couponEntity.useLevel }}元可用</text
+                  >
+                </view>
+                <view style="width: 68%; padding-left: 5%">
+                  <view>
+                    <text
+                      style="
+                        display: inline-block;
+                        margin-right: 6rpx;
+                        line-height: 36rpx;
+                      "
+                      >{{ item.couponEntity.couponName }}</text
+                    >
+                  </view>
+                  <text
+                    style="
+                      display: block;
+                      font-size: 22rpx;
+                      color: #999;
+                      margin-top: 10rpx;
+                    "
+                    >有效期至：{{
+                      item.effectType == 0 ? "永久有效" : item.endTime
+                    }}</text
+                  >
+                  <template v-if="item.canUse == 0">
+                    <view
+                      class=""
+                      style="font-size: 20rpx; display: inline-block"
+                    >
+                      <text style="color: #333">不可用原因：</text>
+                      <text style="color: #333">{{ item.canUseReason }}</text>
+                    </view>
+                  </template>
+                </view>
+                <view
+                  style="width: 7%; position: absolute; right: 20rpx; top: 43%"
+                >
+                  <!-- <view class="" style="background-color: #d9d9d9; border-radius: 10rpx; 0 0 10rpx; text-align: center;" v-if="item.canUse == 0">
+								<text 
+									style="color: #999; "
+									>不可用</text>
+							</view> -->
+
+                  <template v-if="item.canUse == 1">
+                    <text
+                      style="
+                        border: 1px solid #d9d9d9;
+                        width: 35rpx;
+                        height: 35rpx;
+                        display: inline-block;
+                        border-radius: 30rpx;
+                      "
+                      v-if="youhuiIndex !== index"
+                    ></text>
+
+                    <u-icon
+                      name="checkmark-circle-fill"
+                      color="#fd6004"
+                      size="20"
+                      v-if="youhuiIndex === index"
+                    >
+                    </u-icon>
+                  </template>
+                </view>
+                <br clear="both" />
+              </view>
+              <u-collapse
+                v-if="source != 'goodsDetail' && item.couponEntity.remark"
+                style="
+                  margin-top: 0rpx;
+                  z-index: 10 !important;
+                  background-color: #fafafa;
+                  border-bottom-left-radius: 10rpx;
+                  border-bottom-right-radius: 10rpx;
+                "
+                :border="false"
+              >
+                <u-collapse-item title="详细信息" name="Docs guide">
+                  <view
+                    v-if="item.couponEntity.remark"
+                    style="
+                      font-size: 22rpx;
+                      width: 100%;
+                      margin-right: 20rpx !important;
+                    "
+                    >使用说明：{{ item.couponEntity.remark }}</view
+                  >
+                </u-collapse-item>
+              </u-collapse>
+            </view>
+
+            <!-- <view style="font-size: 20rpx;color: #aaa;margin-top: 30rpx;">* 每笔订单只能使用一张优惠价</view> -->
+          </view>
+          <view class="btnBox flex_box flex_between" v-if="selectcouponList.length>0">
+            <view class="" style="width: 48%">
+              <button type="default" @click="confirmCoupon('none')">
+                不使用优惠券
+              </button>
+            </view>
+            <view class="" style="width: 48%">
+              <button type="primary" @click="confirmCoupon()">选好了</button>
+            </view>
+          </view>
+          <view class="btnBox flex_box flex_between" v-else>
+            <view class="" style="width: 100%">
+              <button type="default" @click="confirmCoupon('none')">
+                取消
+              </button>
+            </view>
+           
+          </view>
+        </template>
+        <view class="" v-else>
+          <u-divider text="暂无可用优惠券哦"></u-divider>
+        </view>
+      </view>
+    </u-popup>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "orderCoupon",
+  props: ["list", "curCouponId", "sumMeony",'selectcouponList'],
+  data() {
+    return {
+      youhuiShow: true,
+      youhuiIndex: undefined,
+    };
+  },
+  mounted() {
+    console.log("进入了", this.curCouponId, this.sumMeony);
+    if (this.curCouponId) {
+      this.youhuiIndex = this.list.findIndex(
+        (item) => item.couponEntity.id === this.curCouponId
+      );
+      console.log("查找后的结果", this.youhuiIndex);
+    }
+  },
+  filters: {
+    couponType(type) {
+      // 0无限制 1课程卷 2课程品类卷
+      var str = "";
+      switch (type) {
+        case 0:
+          str = "全场通用";
+          break;
+        case 1:
+          str = "指定课程可用";
+          break;
+        case 2:
+          str = "指定课程品类可用";
+          break;
+      }
+      return str;
+    },
+  },
+  computed: {},
+  methods: {
+    closePup() {
+      this.youhuiIndex = undefined;
+      this.$emit("close");
+    },
+    // 确定选中优惠券
+    confirmCoupon(str) {
+      console.log(str, "6666");
+      if (str && str == "none") {
+        // 清空优惠券操作
+        this.$emit("confirmCoupon");
+        setTimeout(() => {
+          this.closePup();
+        }, 300);
+        return;
+      }
+      if (this.youhuiIndex == 0 || this.youhuiIndex) {
+        this.$emit("confirmCoupon", this.list[this.youhuiIndex]);
+        setTimeout(() => {
+          this.closePup();
+        }, 300);
+      } else {
+        uni.showToast({
+          title: "请选择您要使用的优惠券",
+          icon: "none",
+        });
+      }
+    },
+    // 选择优惠券
+    choseYouhui(e) {
+      if (this.list[e].canUse == 0) {
+        return;
+      }
+      console.log("选中优惠券e", e);
+      this.youhuiIndex = e;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.btnBox {
+  margin-top: 20rpx;
+}
+
+.tanchu {
+  padding: 40rpx 30rpx 40rpx 30rpx;
+  position: relative;
+  // max-height: 60vh;
+  // overflow-y: scroll;
+
+  .dp_title {
+    font-size: 32rpx;
+    margin-bottom: 50rpx;
+    color: #555;
+    text-align: center;
+    font-weight: bold;
+  }
+
+  .dp_add {
+    position: absolute;
+    top: 40rpx;
+    right: 30rpx;
+    font-size: 22rpx;
+    background-color: #fd6004;
+    color: #fff;
+    border-radius: 10rpx;
+    padding: 5rpx 10rpx;
+
+    .u-icon {
+      display: inline-block;
+      margin-right: 5rpx;
+    }
+  }
+
+  .addressItem {
+    border: 2px dashed #d9d9d9;
+    border-radius: 10rpx;
+    width: 100%;
+    display: flex;
+    padding: 20rpx 10rpx;
+    margin: 25rpx 0 0 0;
+    align-items: center;
+    background-color: #fff;
+
+    .addrContent {
+      margin-left: 40rpx;
+      flex: 1;
+
+      .addrContentTop {
+        display: flex;
+        align-items: flex-end;
+        margin: 0 0 15rpx 0;
+        position: relative;
+
+        .userName {
+          font-size: 35rpx;
+          font-weight: bold;
+          margin-right: 30rpx;
+        }
+
+        .userTel {
+          font-size: 25rpx;
+          color: #888;
+        }
+
+        .userMoren {
+          border: 1px solid #fd6004;
+          color: #fd6004;
+          padding: 3rpx 10rpx;
+          font-size: 22rpx;
+          border-radius: 10rpx;
+          margin: 0 0 0 20rpx;
+        }
+
+        .chooseCheck {
+          position: absolute;
+          top: 3rpx;
+          right: 6rpx;
+        }
+      }
+
+      .addrContentBottom {
+        font-size: 32rpx;
+      }
+    }
+  }
+
+  .addressItem.addItem_style {
+    border-color: #fd6004;
+  }
+
+  .youhuiItem {
+    position: relative;
+    background: linear-gradient(to top right, #fff, #fef2f4);
+
+    border: 1px solid #d9d9d9;
+    border-radius: 10rpx;
+    width: 100%;
+
+    padding: 50rpx 20rpx 20rpx;
+    margin: 25rpx 0 0 0;
+    align-items: center;
+    background-color: #fff;
+    font-size: 30rpx;
+  }
+
+  .disableSelect {
+    background: linear-gradient(to top right, #fafafa, #fafafa) !important;
+
+    color: #979797 !important;
+    .couponPrice {
+      color: #979797 !important;
+    }
+    .useLevel {
+      color: #979797 !important;
+    }
+    .border_radius_10 {
+      color: #98989a !important;
+      background-color: #fafafa !important;
+    }
+  }
+  .youhuiItem > view {
+    float: left;
+  }
+
+  .youhuiItem.youItem_style {
+    border-color: #fd6004;
+  }
+}
+::v-deep .u-cell__body {
+  padding-top: 0 !important ;
+  padding-bottom: 0 !important ;
+  z-index: 10 !important ;
+  .u-cell__title-text {
+    color: #333 !important;
+    font-size: 24rpx !important;
+    padding-left: 0 !important;
+  }
+}
+
+::v-deep .u-collapse-item__content__text {
+  padding: 10rpx 20rpx !important;
+  box-sizing: border-box;
+}
+</style>
diff --git a/pages/component/commonComponents/orderSubmit.vue b/pages/component/commonComponents/orderSubmit.vue
new file mode 100644
index 0000000..6e02bf3
--- /dev/null
+++ b/pages/component/commonComponents/orderSubmit.vue
@@ -0,0 +1,2414 @@
+<template>
+    <view>
+      <view class="contentBox commonPageContentBox order_box">
+        <view
+          v-show="isShowAddress"
+          class="order_top common_radius_box color_shandow goods_box address_box"
+          @click="goToAddress"
+        >
+          <u-icon
+            name="map-fill"
+            class="themeColor"
+            size="23"
+            style="display: inline-block; margin-right: 10rpx"
+          ></u-icon>
+          <view class="normal_box" v-if="addressData.consigneeName">
+            <view class="normal_box_top">
+              <view class="curriulum_title">{{ addressData.address }} </view>
+              <view class="user_info">
+                <text class="name"> {{ addressData.consigneeName }} </text>
+                <text class="tel"> {{ addressData.consigneePhone }} </text>
+              </view>
+            </view>
+          </view>
+          <view class="normal_box" v-else>
+            <view class="normal_box_top">
+              <view class="curriulum_title">请添加收货地址 </view>
+            </view>
+          </view>
+          <view class="right">
+            <image
+              src="@/static/icon/icon_right.png"
+              class="rightArrow"
+              style=""
+            ></image>
+          </view>
+        </view>
+  
+        <view class="order_top common_radius_box color_shandow goods_box">
+          <view
+            class="curriulum_title_box goods_item"
+            style="position: relative"
+            v-for="(v, i) in goodsDataList"
+          >
+            <slot name="goodsInfoLabelSlot" :row="v" :rowIndex="i"></slot>
+            <slot name="goodsInfoImgSlot" :row="v" :rowIndex="i"></slot>
+  
+            <view class="normal_box">
+              <view
+                class="normal_box_top"
+                style="justify-content: space-between; position: relative"
+              >
+                <view class="curriulum_title">
+                  <slot name="goodsInfoNameSlot" :row="v" :rowIndex="i"></slot>
+                </view>
+              </view>
+              <view style=" padding-top: 10rpx;">
+                <slot name="goodsInfoPriceSlot" :row="v" :rowIndex="i"></slot>
+  
+                <u-number-box
+                  v-model="v.productAmount"
+				  @change="valChange($event, v)"
+                  style="float: right;"
+                  v-if="showNumber"
+                >
+                  <view slot="minus" class="minus">
+                    <u-icon name="minus" size="12"></u-icon>
+                  </view>
+                  <text
+                    slot="input"
+                    style="width: auto; text-align: center; border: none; line-height: 22px;"
+                    class="input"
+                    >{{ v.productAmount }}</text
+                  >
+                  <view slot="plus" class="plus">
+                    <u-icon name="plus" color="#FFFFFF" size="12"></u-icon>
+                  </view>
+                </u-number-box>
+                <text v-else style="float: right"> X {{ v.productAmount }}</text>
+              </view>
+            </view>
+          </view>
+          <view
+            class="pay_box"
+            style="margin-top: 20rpx"
+            v-if="!options.isFudu && !options.isVip"
+          >
+            <view
+              @click="openOrderModal(v)"
+              class="curriulum_title_box goods_item pay_item"
+              v-for="(v, i) in orderInfoList"
+              :key="i"
+            >
+              <view class="top">
+                <view class="left">
+                  <text> {{ v.text }}</text>
+                </view>
+                <view class="right" style="display: flex; align-items: center">
+                  <text
+                    style="
+                      float: left;
+                      text-align: right;
+                      color: #b0b0b0;
+                      font-size: 28rpx;
+                      display: inline-block;
+					  max-width: 480rpx;
+                    "
+                    :class="remark ? 'hidden1 hasRemark' : 'hidden1'"
+                  >
+                    {{ remark == "" ? v.placeholder : remark }}</text
+                  >
+                  <image
+                    src="@/static/icon/icon_right.png"
+                    class="rightArrow"
+                    style=""
+                  ></image>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+  
+        <view class="order_top common_radius_box color_shandow goods_box pay_box">
+          <view class="title">价格明细</view>
+  
+          <view
+            class="curriulum_title_box goods_item pay_item"
+            v-for="(v, i) in priceBreakdownList"
+            :key="i"
+          >
+            <view class="top">
+              <view class="left">
+                <image
+                  v-if="v.imgUrl"
+                  class="pay_item_img"
+                  :src="v.imgUrl"
+                  mode="aspectFil"
+                  :style="v.style"
+                >
+                </image>
+                <u-icon
+                  v-if="v.icon"
+                  name="map-fill"
+                  color="#018F89"
+                  size="23"
+                  style="display: inline-block"
+                ></u-icon>
+  
+                <text v-if="v.type == 6">
+                  <span
+                    style="color: #f94f04; font-weight: bold; margin-right: 2px"
+                    >VIP</span
+                  >
+                  专享立减</text
+                >
+                <text v-else> {{ v.text }}</text>
+                <template v-if="v.type == 4">
+                  <text style="color: #aaa; margin-left: 10rpx">
+                    (全部积分：{{ initData.user.jf }})</text
+                  >
+                </template>
+              </view>
+              <view class="right">
+                <template v-if="v.type == 1">
+                  ￥{{ Number(totalPrice).toFixed(2) }}</template
+                >
+                <template v-if="v.type == 2">
+                  <text>
+                    ￥{{
+                      isShowAddress ? freightNum.toFixed(2) : Number(0).toFixed(2)
+                    }}</text
+                  >
+                </template>
+                <template v-if="v.type == 3">
+                  <template v-if="!curCoupon.id">
+                    <view
+                      v-if="couponHistoryList.length > 0"
+                      @click="showCouponPup = true"
+                      style="display: flex; align-items: center"
+                    >
+                      <text
+                        style="color: #999"
+                        v-if="selectcouponList.length == 0"
+                        >不可用
+                      </text>
+                      <text
+                        style="
+                          color: #ec4729;
+                          background-color: #fceeeb;
+                          padding: 1rpx 20rpx;
+                          border-radius: 10rpx;
+                          line-height: 34rpx;
+                        "
+                        v-else
+                        >共 {{ selectcouponList.length }} 张
+                      </text>
+  
+                      <image
+                        src="@/static/icon/icon_right.png"
+                        class="rightArrow"
+                        style=""
+                      ></image>
+                    </view>
+                    <template v-else>
+                      <text style="color: #999">暂无可用优惠券</text>
+                    </template>
+                  </template>
+                  <template v-else>
+                    <text style="color: #fe6035"
+                      >- ￥ {{ curCoupon.couponEntity.couponAmount }}</text
+                    >
+                    <text
+                      @click="showCouponPup = true"
+                      style="
+                        display: inline-block;
+                        margin-left: 20rpx;
+                        background-color: #fe6035;
+                        color: #fff;
+                        border-radius: 30rpx;
+                        font-size: 26rpx;
+                        border: 4rpx #fe6035 solid;
+                      "
+                      >重新选择</text
+                    >
+                  </template>
+                </template>
+  
+                <template v-if="v.type == 4">
+                  <text style="color: #fe6035"> -￥{{ jfNumberShow }}</text>
+                </template>
+                <template v-if="v.type == 5">
+                  <text style="color: #fa2d12"
+                    >- ￥{{ districtAmount.toFixed(2) }}</text
+                  >
+                </template>
+                <template v-if="v.type == 6">
+                  <text style="color: #fa2d12"
+                    >- ￥{{ vipPrice.toFixed(2) }}</text
+                  >
+                </template>
+              </view>
+            </view>
+  
+            <view
+              class="bottom jf_box"
+              v-if="v.type == 4 && initData.user.jf > 0"
+            >
+              <view class="jf_box">
+                <text class="themeColor" style="font-weight: 600"
+                  >可用积分({{ jfNumberMax }}分)</text
+                >
+                <view class="jf_input">
+                  <u--input
+                    type="number"
+                    @input="handleChangejf"
+                    @clear="jfNumber = 0"
+                    :max="jfNumberMax"
+                    :min="0"
+                    v-model="jfNumber"
+                    placeholder="请输入积分"
+                    border="surround"
+                    clearable
+                  ></u--input>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="order_top common_radius_box color_shandow goods_box pay_box">
+          <view class="title">支付方式</view>
+          <!-- 商品是安卓环境支付，或者商品列表中没有课程 -->
+          <view
+            class="curriulum_title_box goods_item pay_item"
+            v-for="(v, i) in payList"
+          >
+            <view :class="isDefaultCurrency && i != 2 ? 'bgGrey top' : 'top'">
+              <view class="left">
+                <image
+                  class="pay_item_img"
+                  :src="v.imgUrl"
+                  mode="aspectFil"
+                  :style="v.style"
+                >
+                </image>
+                <template v-if="v.type == 4">
+                  <text> {{ v.text }}</text>
+                  <text
+                    class="themeColor"
+                    style="font-weight: 600; margin-left: 10rpx"
+                  >
+                    (余额：{{
+                      initData && initData.user ? initData.user.peanutCoin : 0
+                    }})</text
+                  >
+                </template>
+  
+                <text v-else> {{ v.text }}</text>
+              </view>
+  
+              <template v-if="isDefaultCurrency">
+                <radio
+                  v-if="i == 2"
+                  :value="v.value"
+                  :color="themeColor"
+                  :checked="selectPayIndex == i ? true : false"
+                  @click="radioChange(i)"
+                  size="10"
+                />
+              </template>
+              <template v-else>
+                <radio
+                  :value="v.value"
+                  :color="themeColor"
+                  :checked="selectPayIndex == i ? true : false"
+                  @click="radioChange(i)"
+                  size="10"
+                />
+              </template>
+            </view>
+          </view>
+          <template v-if="selectPayIndex == 2 || $platform == 'ios'">
+            <view
+              class="goods_detail_list_title bg_box_shandow color_shandow bg_color"
+            >
+              <view
+                class="linlanzhifu"
+                style="
+                  width: 100%;
+                  overflow: hidden;
+                  justify-content: space-between;
+                "
+              >
+                <view class="linlanzhifu">
+                  <u-icon
+                    name="error-circle"
+                    class="themeColor"
+                    size="20"
+                    style="display: inline-block; margin-right: 10rpx"
+                  ></u-icon>
+                  确保您的天医币足够支付
+                </view>
+  
+                <text
+                  class="fdButtonBox aui-text-danger fdButtonBoxRed"
+                  style="float: right"
+                  @click="
+                    onPageJump('/pages/wallet/recharge')
+                  "
+                  >立即充值</text
+                >
+              </view>
+  
+              <view class="other_info" style="margin-top: 12rpx">
+                <view class="explain" style="margin-bottom: 10rpx"> 说明 </view>
+                <view class="explain"> 1. 1天医币 = 1元人民币 </view>
+                <view class="explain">
+                  2.若有疑问或意见请致电客服
+                  <span style="font-size: 15px"
+                    ><u @click="gotoPhone">022-24142321</u></span
+                  >
+                </view>
+                <view class="explain">
+                  3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！
+                  支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱
+                  <text
+                    @click="fnCopy('publisher@tmrjournals.com', '邮箱')"
+                    class="aui-text-success themeColor"
+                    style="text-decoration: underline"
+                  >
+                    publisher@tmrjournals.com
+                  </text>
+                  （点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（
+                  <text
+                    class="aui-text-success themeColor"
+                    @click="fnCopy('yilujiankangkefu', '微信名')"
+                    style="text-decoration: underline"
+                  >
+                    yilujiankangkefu </text
+                  >）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。
+                </view>
+              </view>
+            </view>
+          </template>
+        </view>
+  
+        <template>
+          <common-sticky
+            label="title"
+            :itemStyle="`width:${
+              cateList.length == 2 ? '50' : '33'
+            }%;padding-left: 15px; padding-right: 15px; height: 68rpx;`"
+            :list="cateList"
+            :currentCateIndex="currentCateIndex"
+            @handleselectCate="handleselectCate"
+          >
+          </common-sticky>
+        </template>
+      </view>
+      <view class="goods_nav_box">
+        <common-goods-nav
+          :iconList="[]"
+          :customButton="customButton"
+          @submit="goBuyJie"
+        >
+          <!-- leftSlot -->
+          <template slot="leftSlot" slot-scope="slotProps">
+            <view class="price_box order_bottom_box">
+              <text class="price"
+                >合计：
+				<text class="total" v-if="actualPayment==0">{{jfNumber}}积分</text>
+                <text class="total" v-else>
+                  ￥{{ Number(actualPayment).toFixed(2) }}
+                  <text
+                    style="margin: 0 4rpx"
+                    v-if="actualPayment > 0 && jfNumber > 0"
+                  >
+                    +
+                  </text>
+  
+                  <text v-if="jfNumber > 0">{{ jfNumber }} 积分</text>
+                </text>
+              </text>
+            </view>
+          </template>
+        </common-goods-nav>
+        <view
+          class="agree_wo"
+          style="background-color: #fff"
+          v-if="pageType == 'vip'"
+        >
+          <radio-group class="agree">
+            <view v-for="(item, index) in argee" :key="index">
+              <radio
+                class="agreeRadio"
+                :value="item.id"
+                :checked="item.id == radioValue"
+                color="#7dc1f0"
+                @click="radioCheck(index)"
+              ></radio>
+            </view>
+          </radio-group>
+          <view
+            >* 我已阅读并同意<span class="highlight" @click="showXieyi"
+              >《会员服务协议》</span
+            ></view
+          >
+        </view>
+      </view>
+  
+      <u-popup :show="show" mode="right">
+        <common-address
+          backState="3000"
+          ref="commonAddress"
+          @fresh="handleFresh"
+          @selectAddress="selectAddress"
+        ></common-address
+      ></u-popup>
+      <u-popup :show="orderModalShow" mode="bottom" :round="20">
+        <view class="orderModalShow popup_box">
+          <u-icon
+            name="close"
+            color="#333"
+            size="18"
+            @click="closeOrderModalShow"
+            style="
+              display: inline-block;
+              position: absolute;
+              right: 20rpx;
+              top: 20rpx;
+            "
+          ></u-icon>
+          <view v-if="orderModalShowInfo.type == 'remark'">
+            <view class="order_top common_radius_box goods_box">
+              <view class="curriulum_title_box goods_item">
+                <view class="title">订单备注</view>
+                <u--textarea
+                  v-model="content"
+                  placeholder="选填：给商家留言"
+                  count
+                  class="textarea"
+                ></u--textarea>
+              </view>
+            </view>
+          </view>
+          <view class="goods_nav_box">
+            <uni-goods-nav
+              :fill="true"
+              :options="[]"
+              :button-group="customButtonGroup1"
+              @click="onHandleClickBuy"
+              @buttonClick="onHandleClickBuy"
+            />
+          </view>
+        </view>
+      </u-popup>
+      <order-coupon
+        v-if="showCouponPup"
+        :sumMeony="totalPrice"
+        :selectcouponList="selectcouponList"
+        :curCouponId="curCouponId"
+        :list="couponHistoryList"
+        ref="orderCoupon"
+        @confirmCoupon="confirmCoupon"
+        @close="closeCoupon"
+      ></order-coupon>
+      <u-popup :show="xieyiShow" :round="10" @close="xieyiShow = false">
+        <view class="tanchu">
+          <view class="dp_title">{{ xieyi.title }}</view>
+          <view style="max-height: 1000rpx; overflow-y: scroll">
+            <view v-html="xieyi.content"></view>
+          </view>
+        </view>
+      </u-popup>
+    </view>
+  </template>
+  
+  <script>
+   var themeColor='#7dc1f0';
+  import orderCoupon from "@/pages/component/commonComponents/orderCoupon.vue";
+  import courseDescription from "@/pages/component/commonComponents/list";
+  import { setPay, setPayAssign, setWXPay } from "@/config/utils";
+  import $http from "@/config/requestConfig.js";
+  const { platform } = uni.getSystemInfoSync();
+  import { mapState } from "vuex";
+  export default {
+    props: [
+      "options",
+      "pageType",
+      "goodsDataList",
+      "showNumber",
+      "isHideAddress",
+      "priceKey",
+      "initData",
+      "urlList",
+      "isHideJf",
+    ],
+    components: {
+      courseDescription, //课程说明
+      orderCoupon, // 优惠券弹出
+    },
+    watch: {
+      isDefaultCurrency: {
+        immediate: true,
+        handler(newRoute) {
+          if (this.isDefaultCurrency) {
+            if (platform == "ios") {
+              this.selectPayIndex = 0;
+            } else {
+              this.selectPayIndex = 0;
+            }
+          } else {
+            if (platform == "ios") {
+              this.selectPayIndex = 0;
+            } else {
+              this.selectPayIndex = 0;
+            }
+          }
+  
+          this.payType = this.payList[this.selectPayIndex].type;
+          if (this.actualPayment == 0) {
+            var that = this;
+            this.payList.forEach((e, i) => {
+              if (e.type == 4) {
+                that.selectPayIndex = i;
+                that.payType = 4;
+              }
+            });
+            this.$forceUpdate();
+          }
+          this.$forceUpdate();
+        },
+      },
+	  orderNumber: {
+	    immediate: true,
+	    handler(newRoute) {
+	      if (this.orderNumber >= 1) {
+	        this.$nextTick(async () => {
+				await this.getGoodsList();
+	        });
+	      }
+	      this.$forceUpdate();
+	    },
+	  },
+    },
+    data() {
+      return {
+        appName: "xlkj",
+        come: 3,
+        argee: [{ value: false, id: "1" }], // 同意权限
+        radioValue: "",
+        xieyi: {
+          title: "",
+          content: "",
+        },
+        xieyiShow: false,
+        vipPrice: 0,
+        districtAmount: 0,
+        historyOrderInfo: undefined, //上一个订单的参数
+        isDefaultCurrency: false,
+        isShowAddress: false,
+        jfNumber: 0,
+        orderNumber: 1,
+        totalPrice: 0,
+        actualPayment: 0,
+        jfNumberShow: "",
+        jfNumberMax: 0,
+        selectcouponList: [],
+  
+        orderModalShowInfo: {},
+        orderModalShow: false,
+        payType: 1,
+        freightNum: 0,
+        addressData: {
+          address: "",
+          consigneeName: "",
+          consigneePhone: "",
+        },
+        selectPayIndex: 1,
+        farePrice: 0,
+        payList: [],
+        priceBreakdownList: [],
+        orderInfoList: [
+          {
+            text: "订单备注",
+            placeholder: "点击填写订单备注",
+            imgUrl: "",
+            type: "remark",
+          },
+        ],
+        number: 1,
+        detailInfo: {},
+        content: "",
+        remark: "",
+        iconList: [],
+        buyingFlag: false, // 购买进行中flag
+        swiperList: [],
+  
+        relatedCoursesList: [], //相关课程
+        curriculumData: {},
+        curriculumInfo: {},
+        detailInfo: {},
+        themeColor:themeColor,
+        fdButtonStyle: {
+          width: "120rpx",
+          "border-color": themeColor,
+          color: themeColor,
+          float: "right",
+          "margin-right": "20rpx",
+          "margin-left": "30rpx",
+        },
+        modalInfo: {},
+        canjump: true, // 是否可以跳转到其他页面
+        currentCateIndex: 0,
+        show: false,
+        playData: {},
+  
+        taiHuClassInfo: {},
+        searchValue: "",
+        teachingList: [
+          {
+            title: "临床实践",
+  
+            type: "02",
+            apiUrl: "app/phoneDoctor.do?getTaiHuToShine",
+          },
+          {
+            title: "学习问答",
+            type: "03",
+            oid: "8a9fb99809e4428888aad6b56a3096a6",
+          },
+          {
+            title: "学习心得",
+  
+            type: "01",
+          },
+          {
+            title: "在线作业",
+  
+            type: "04",
+            oid: "d0f47071c2194e94845fbb373d06f59d",
+          },
+        ], // 一级分类标题1
+        cateList: [], // 一级分类标题1
+        twoCateList: [], // 二级分类标题
+        dataList: [], // 方剂标题
+        defaultAddressList: {},
+        allDataList: [], // 方剂标题
+        currentStatusIndex: 0, // 当前选中的一级分类
+  
+        curTwoCateIndex: 0, // 当前选中的二级分类
+        searchList: [], // 搜索结果数组
+        showSearchList: false,
+        userMes: {}, // 用户信息
+        searchDisable: false, // 搜索不可用
+        limitShow: false,
+        limitTitle: "提示",
+        goToInfo: {},
+        limitContent: "",
+        scrollViewHeight: 0,
+  
+        customButton: [
+          {
+            width: "200rpx",
+            text: "立即支付",
+            backgroundColor: `linear-gradient(90deg,  ${themeColor} 0%,${themeColor} 100%)`,
+            color: "#fff",
+          },
+        ],
+        customButtonGroup1: [
+          {
+            with: 200,
+            text: "确定",
+            backgroundColor: `linear-gradient(90deg,  ${themeColor} 0%,${themeColor} 100%)`,
+            color: "#fff",
+          },
+        ],
+        haveCourse: false, // 结算队列是否有课程类型的商品
+        isAndroid: null, //操作系统
+        beizhuShow: false, // 是否显示天医币说明？
+        couponHistoryList: [], // 可用优惠券
+        showCouponPup: false, // 是否显示优惠券弹窗
+        curCoupon: {}, // 选中的优惠券信息
+        curCouponId: undefined,
+      };
+    },
+  
+    async mounted() {
+      this.curCouponId = undefined;
+      var that = this;
+      await uni.$on("returnData", function (data) {
+        if (data) {
+          that.addressData = {
+            ...data,
+            address: `${data.province}${data.city}${data.county}${data.detailAddress}`,
+            consigneeName: data.consigneeName,
+            consigneePhone: data.consigneePhone,
+          };
+          that.$forceUpdate();
+  
+          that.getUserAddress();
+        } else {
+        }
+      });
+  
+      if (platform == "ios") {
+        this.payList = [
+          {
+            text: "天医币",
+            imgUrl: require("@/static/icon/pay_3.png"),
+            type: 4,
+            value: "2",
+          },
+        ];
+        this.selectPayIndex = 0;
+        this.payType = 4;
+      } else {
+        this.payList = [
+          {
+            text: "支付宝",
+            imgUrl: require("@/static/icon/pay_1.png"),
+            type: 2,
+            value: "0",
+          },
+          {
+            text: "微信",
+            imgUrl: require("@/static/icon/pay_2.png"),
+            type: 1,
+            value: "1",
+          },
+          {
+            text: "天医币",
+            imgUrl: require("@/static/icon/pay_3.png"),
+            type: 4,
+            value: "2",
+          },
+        ];
+        this.selectPayIndex = 1;
+        this.payType = 1;
+      }
+    },
+    computed: {
+      ...mapState(["userInfo"]),
+    },
+    methods: {
+      radioCheck(index) {
+        this.argee.forEach((item) => {
+          item.isCheck = false;
+        });
+        if (this.radioValue == this.argee[index].id) {
+          this.radioValue = null;
+        } else {
+          this.radioValue = this.argee[index].id;
+        }
+      },
+      //会员协议
+      async showXieyi() {
+        var data = await this.$commonJS.getAgreement(107);
+        if (data.content) {
+          data.content = data.content.replace(
+            /<h5>/g,
+            '<view style="font-weight: bold;font-size: 32rpx;margin-top: 20rpx;margin-bottom: 20rpx;">'
+          );
+          data.content = data.content.replace(/<\/h5>/g, "</view>");
+        }
+  
+        this.xieyi = data;
+        this.xieyiShow = true;
+      },
+      async getGoodsList() {
+        //获取商品信息
+        await this.initPrepareOrder();
+		
+		if (this.pageType == "vip") {
+		  await this.getTotalPrice();
+		} else {
+		  await this.getVipFei();
+		  await this.getDistrictAmount();
+		  await this.getActiveCouponList();
+		}
+		  
+		var list = [...this.goodsDataList];
+		list = list.map((e) => e.goodsType);
+		this.haveCourse = list.some((ele) => ele === "05");
+		if (this.options.sourceType == "curriculum") {
+			this.goToInfo = {
+				url: "/pages/curriculum/index/index",
+				type: 2,
+			};
+			} else {
+			this.goToInfo = {
+				url: "/pages/order/index",
+				type: 1,
+			};
+		}
+      },
+      async getVipFei() {
+        let key = [];
+        let dataToString = "";
+        this.goodsDataList.forEach((item, index) => {
+          key.push({
+            productId: item.productId,
+            quantity: item.productAmount
+          });
+        });
+  
+        await $http
+          .request({
+            url: "/book/buyOrder/getVipDiscountAmount",
+            method: "POST",
+            data: {
+              productList: key,
+            },
+            header: {
+              "Content-Type": "application/json",
+            },
+          })
+          .then(async (res) => {
+            if (res.code == 0) {
+              console.log("res.code at line 538:", res);
+              this.vipPrice = res.discountAmount;
+              await this.getTotalPrice();
+            }
+          });
+      },
+      async getDistrictAmount() {
+        let key = [];
+        let dataToString = "";
+  
+        this.goodsDataList.forEach((item, index) => {
+          key.push({
+            productId: item.productId,
+            quantity: item.productAmount
+          });
+        });
+        console.log(key, "this.adressMoRen.areaidpath");
+  
+        await $http
+          .request({
+            url: "/book/buyOrder/getDistrictAmount",
+            method: "POST",
+            data: {
+              productList: key,
+            },
+            header: {
+              "Content-Type": "application/json",
+            },
+          })
+          .then(async (res) => {
+            if (res.code == 0) {
+              console.log("res.code at line 538111111111111111:", res);
+              this.districtAmount = res.districtAmount;
+              await this.getTotalPrice();
+            }
+          });
+      },
+      closeCoupon() {
+        this.showCouponPup = false;
+      },
+      confirmCoupon(data) {
+        if (data) {
+          this.curCoupon = data;
+          this.curCouponId = data.couponEntity.id;
+        } else {
+          this.curCoupon = {};
+          this.curCouponId = undefined;
+        }
+  
+        this.getTotalPrice();
+      },
+      // 查询商品可用优惠券
+      async getActiveCouponList() {
+        var list = [];
+        this.goodsDataList.forEach((e) => {
+          var str = `${e.productId}:${
+            e.activityPrice > 0 ? e.activityPrice : e[this.priceKey]
+          }:${e.productAmount}`;
+          list.push(str);
+        });
+  
+        var idsString = list.join(",");
+        this.$http
+          .request({
+            url: "common/coupon/getCouponListPayment",
+            method: "POST",
+            data: {
+              shopProductInfos: idsString,
+            },
+            header: {
+              "Content-Type": "application/json",
+            },
+          })
+  
+          .then(async (res) => {
+            if (res.code != 0) {
+              uni.showToast({
+                title: res.errMsg,
+                icon: "none",
+              });
+              if (this.isShowAddress) {
+                await this.getUserAddress();
+              } else {
+                await this.getTotalPrice();
+              }
+  
+              return;
+            }
+            if (res.code == 0) {
+              this.couponHistoryList = res.couponHistoryList;
+  
+              this.selectcouponList = this.couponHistoryList.filter(
+                (item) => item.canUse != 0
+              );
+              if (
+                this.selectcouponList.filter(
+                  (item) => item.couponId == this.curCouponId
+                ).length == 0
+              ) {
+                this.curCoupon = {};
+                this.curCouponId = undefined;
+              }
+            } else {
+              this.couponHistoryList = [];
+  
+              this.selectcouponList = [];
+            }
+  
+            if (this.selectcouponList.length == 0) {
+              this.curCoupon = {};
+              this.curCouponId = undefined;
+            }
+  
+            this.$forceUpdate();
+            if (this.isShowAddress) {
+              await this.getUserAddress();
+            } else {
+              await this.getTotalPrice();
+            }
+          })
+          .catch((e) => {
+            uni.showToast({
+              title: e.errMsg,
+              icon: "none",
+            });
+          });
+      },
+      handleChangejf(val) {
+        var value = val;
+        this.$nextTick(() => {
+          // 1. 只允许数字字符，并去掉小数点后的部分
+          value = value.replace(/[^0-9.]/g, ""); // 删除非数字和小数点字符
+  
+          // 2. 如果有小数点，只保留小数点前的部分
+          if (value.indexOf(".") !== -1) {
+            value = value.split(".")[0]; // 截取小数点前的部分
+          }
+ 
+          // 如果输入为0，强制设置为0并显示为 "0"
+          if (val == 0) {
+            this.jfNumber = 0;
+            this.jfNumberShow = "0";
+          } else {
+            // 3. 强制转换为正整数
+            let numericValue = parseInt(value, 10); // 使用parseInt转换为整数
+            if (numericValue < 0 || isNaN(numericValue)) {
+              numericValue = 0;
+            }
+  
+            // 4. 确保最大值限制
+            if (numericValue >= this.jfNumberMax) {
+              numericValue = this.jfNumberMax;
+            }
+  
+            // 更新最终的数字值和显示
+            this.jfNumber = Math.max(0, numericValue); // 强制为正整数
+            this.jfNumberShow = this.jfNumber.toString(); // 显示整数
+          }
+  
+          // 计算实际支付金额
+          var couponAmount = 0;
+          if (this.curCouponId && this.curCoupon.couponEntity.id) {
+            couponAmount = this.curCoupon.couponEntity.couponAmount;
+          }
+		  
+          this.actualPayment =
+            this.totalPrice -
+            couponAmount -
+            this.jfNumber +
+            this.freightNum -
+            this.districtAmount -
+            this.vipPrice;
+  
+          // 如果实际支付金额为0，设置支付方式为默认货币
+          if (this.actualPayment == 0) {
+            console.log("this.actualPayment at line 1097:", this.actualPayment);
+            this.isDefaultCurrency = true;
+            var that = this;
+            this.payList.forEach((e, i) => {
+              if (e.type == 4) {
+                that.selectPayIndex = i;
+                that.payType = 4;
+              }
+            });
+            this.$forceUpdate();
+          } else {
+            this.isDefaultCurrency = false;
+          }
+          this.$forceUpdate();
+        });
+      },
+	  //修改数量
+	  valChange(e, item) {
+	    let productItem = {};
+	    productItem = item;
+	    productItem.productAmount = e.value;
+	    this.updateCart(productItem);
+	    this.$nextTick(async () => {
+	    	await this.getGoodsList();
+	    });
+	  },
+	  //更新购物车
+	  updateCart(data) {
+	    $http.request({
+	        url: "book/ordercart/update",
+	        method: "POST",
+	        data: data,
+	        header: {
+	          "Content-Type": "application/json",
+	        },
+	      })
+	      .then((res) => {
+	        if (res.code == 0) {
+				
+	        }
+	      });
+	  },
+      onHandleClickBuy() {
+        this.orderModalShow = false;
+        this.remark = this.content;
+      },
+      closeOrderModalShow() {
+        if (this.orderModalShowInfo.type == "remark") {
+          this.content = "";
+        }
+        this.orderModalShow = false;
+      },
+      onPageJump(url) {
+        console.log(url, "url");
+        uni.navigateTo({
+          url: url,
+        });
+      },
+      // 获取订单初始话
+      async initPrepareOrder() {
+        if (this.options.isFudu) {
+          this.priceBreakdownList = [
+            {
+              text: "商品总价",
+              imgUrl: "",
+              type: 1,
+            },
+            {
+              text: "运费",
+              imgUrl: "",
+              type: 2,
+            },
+          ];
+        } else {
+          this.priceBreakdownList = [
+            {
+              text: "商品总价",
+              imgUrl: "",
+              type: 1,
+            },
+            {
+              text: "运费",
+              imgUrl: "",
+              type: 2,
+            },
+  
+            {
+              text: "优惠券",
+              imgUrl: "",
+              type: 3,
+            },
+          ];
+        }
+        if (
+          this.goodsDataList[0].activityPrice &&
+          this.goodsDataList[0].activityPrice > 0
+        ) {
+          this.priceBreakdownList.push({
+            text: "活动立减",
+            imgUrl: "",
+            type: 5,
+          });
+        }
+        if (
+          this.goodsDataList[0].isVipPrice &&
+          this.goodsDataList[0].vipPrice &&
+          this.goodsDataList[0].vipPrice > 0
+        ) {
+          this.priceBreakdownList.push({
+            text: "VIP专享立减",
+            imgUrl: "",
+            type: 6,
+          });
+        }
+  
+        this.isShowAddress = !this.isHideAddress;
+        if (!this.isShowAddress&&this.initData.user.jf>0) {
+          this.priceBreakdownList.push({
+            text: "积分",
+            imgUrl: require("@/static/icon/jifen.png"),
+            type: 4,
+          });
+        }
+      },
+      // 获取地址列表
+      async getUserAddress() {
+        var data = {};
+  
+        var that = this;
+  
+        this.$http
+          .request({
+            url: `${this.urlList.addressList}?userId=${this.userInfo.id}`,
+            method: "POST",
+            data,
+            header: {
+              "Content-Type": "application/json",
+            },
+          })
+  
+          .then(async (res) => {
+            console.log("res at line 374:", res);
+            if (res.code == 0) {
+              if (res.list.length > 0) {
+                var index = res.list.findIndex((e) => e.isDefault == 1);
+                if (index >= 0) {
+                  that.defaultAddressList = {
+                    ...res.list[index],
+  
+                    address: `${res.list[index].province}${res.list[index].city}${
+                      res.list[index].county
+                    }${
+                      res.list[index].detailAddress
+                        ? res.list[index].detailAddress
+                        : ""
+                    }`,
+                  };
+                } else {
+                  that.defaultAddressList = {
+                    ...res.list[0],
+                    address: `${res.list[0].province}${res.list[0].city}${
+                      res.list[0].county
+                    }${
+                      res.list[0].detailAddress ? res.list[0].detailAddress : ""
+                    }`,
+                  };
+                }
+              } else {
+                this.defaultAddressList = {};
+              }
+            }
+            if (!this.addressData.id) {
+              this.addressData = this.defaultAddressList;
+            }
+            if (this.defaultAddressList.id) {
+              console.log("有默认地址");
+              await this.getFreightNum();
+            }
+            this.$forceUpdate();
+          });
+      },
+  
+      //获取运费
+      async getFreightNum() {
+        console.log("this.userInfo.id at line 368:", this.userInfo.id);
+        var data = {
+          products: this.goodsDataList.map((e) => {
+            return {
+              productId: e.productId,
+              quantity: e.productAmount
+            };
+          }),
+          regionCode: this.addressData.regionCode,
+        };
+  
+        var that = this;
+  
+        this.$http
+          .request({
+            url: `${this.urlList.freightNum}`,
+            method: "POST",
+            data,
+            header: {
+              "Content-Type": "application/json",
+            },
+          })
+  
+          .then(async (res) => {
+            console.log("res at line 37411:", res);
+            if (res.code == 0) {
+              this.freightNum = res.result;
+            }
+            await this.getTotalPrice();
+            this.$forceUpdate();
+          });
+      },
+      handleFresh() {
+        this.show = false;
+      },
+	  //计算总价
+      async getTotalPrice() {
+        var s = 0;
+        var that = this;
+		that.goodsDataList.forEach((item, index) => {
+		  let price = 0;
+		  price = (item.productAmount * item.price).toFixed(2);
+		  s += Number(price);
+		});
+		
+        that.totalPrice = s;
+        var couponAmount = 0;
+        var couponData = this.selectcouponList.filter(
+          (e) => e.couponId == that.curCouponId
+        );
+        if (this.curCoupon.couponId) {
+          couponAmount = that.curCoupon.couponEntity.couponAmount;
+        } else {
+          couponAmount = 0;
+        }
+        if (!this.isShowAddress) {
+          if (that.initData.user && that.initData.user.jf) {
+            var totalMoney =
+              that.totalPrice - that.districtAmount - that.vipPrice;
+            if (this.initData.user.jf >= totalMoney) {
+              const integerPart = Math.floor(totalMoney);
+  
+              this.jfNumber = integerPart - couponAmount; // 设置 jfNumber
+              this.jfNumberMax = integerPart - couponAmount; // 设置 jfNumberMax
+            } else {
+              if (this.initData.user.jf >= couponAmount) {
+                this.jfNumber = this.initData.user.jf - couponAmount;
+                this.jfNumberMax = this.initData.user.jf - couponAmount;
+              } else {
+                this.jfNumber = this.initData.user.jf;
+                this.jfNumberMax = this.initData.user.jf;
+              }
+            }
+          } else {
+            this.jfNumber = 0;
+          }
+  
+          if (that.jfNumber == 0 || that.jfNumber == null) {
+            that.jfNumberShow = "0.00";
+            that.actualPayment = that.totalPrice - couponAmount;
+          } else {
+            that.jfNumberShow = that.jfNumber.toFixed(2);
+            that.actualPayment = that.totalPrice - that.jfNumber - couponAmount;
+          }
+          that.actualPayment =
+            that.actualPayment +
+            that.freightNum -
+            that.districtAmount -
+            that.vipPrice;
+			console.log(that.actualPayment)
+        } else {
+          that.actualPayment =
+            that.totalPrice +
+            that.freightNum -
+            couponAmount -
+            that.districtAmount -
+            that.vipPrice;
+        }
+        if (this.actualPayment == 0 && !this.isShowAddress) {
+          this.isDefaultCurrency = true;
+        } else {
+          this.isDefaultCurrency = false;
+        }
+        this.$forceUpdate();
+      },
+      selectAddress(data) {
+        this.show = false;
+      },
+      goToAddress() {
+        uni.navigateTo({
+          url: "/pages/component/commonComponents/address/index?type=order",
+        });
+      },
+      fnCopy(value, title) {
+        this.$commonJS.handleMakingPhoneCalls(value, title);
+      },
+  
+      gotoPhone() {
+        this.$commonJS.handleMakingPhoneCalls("022-24142321");
+      },
+      openOrderModal(v) {
+        this.orderModalShowInfo = v;
+        console.log(
+          "this.orderModalShowInfo at line 727:",
+          this.orderModalShowInfo
+        );
+        this.orderModalShow = true;
+        if (this.orderModalShowInfo.type == "remark") {
+          this.content = this.remark;
+        }
+      },
+      async goBuyJie() {
+        if (this.pageType == "vip") {
+          if (this.radioValue != "1") {
+            uni.showToast({
+              title: "请勾选 已阅读会员服务协议",
+              icon: "none",
+            });
+            return false;
+          }
+        }
+  
+        if (this.buyingFlag) {
+          uni.showToast({
+            title: "操作太频繁了，休息下吧",
+            icon: "none",
+          });
+          return;
+        }
+        this.buyingFlag = true;
+        var that = this;
+        this.nowClick = false;
+        setTimeout(() => {
+          this.nowClick = true;
+        }, 5000);
+  
+        let xiaBiao = [];
+        let data = {};
+  
+        if (
+          this.payType == 4 &&
+          this.initData.user.peanutCoin < Number(this.actualPayment)
+        ) {
+          uni.showToast({
+            title: "天医币余额不足",
+            icon: "none",
+          });
+          return;
+        }
+        if (this.pageType == "fudu") {
+          data = {
+            jfDeduction: this.jfNumber,
+            paymentMethod: this.payType, //支付方式   2支付宝，1微信，3ios内购    4，天医币购买
+            orderMoney: this.totalPrice, //订单金额
+            realMoney: this.actualPayment, //实收金额
+            remark: this.goodsDataList
+              .map((e) => e.productId + "," + e.productName)
+              .join(","), //productId,商品名
+            come: this.come,
+          };
+        } else if (this.pageType == "vip") {
+          data = {
+            paymentMethod: this.payType, //1微信2支付宝3苹果支付4虚拟币
+            orderMoney: this.totalPrice, //订单金额
+            realMoney: this.actualPayment, //实际金额
+            shippingMoney: 0, //运费
+            jfDeduction: this.jfNumber,
+            vipBuyConfigId: this.goodsDataList[0].id,
+            come: this.come, //订单来源，0疯子读书1国学众妙之门2医学吴门医述
+          };
+        } else {
+          if (this.options.goods[0].goodsType != "05") {
+            if (!this.addressData.id) {
+              this.$commonJS.showToast("请选择收货地址");
+              return false;
+            }
+          }
+  
+          data = {
+            buyType: this.options.typeId, //0- 商品页直接下单  1- 购物车结算
+            userId: this.userInfo.id, //下单人ID
+            shippingUser: this.addressData
+              ? this.addressData.consigneeName
+              : "111", //收货人姓名
+            userPhone: this.addressData.consigneePhone, //收货人手机号
+            jfDeduction: this.jfNumber,
+            paymentMethod: this.payType, //支付方式   2支付宝，1微信，3ios内购    4，天医币购买
+            orderMoney: this.totalPrice, //订单金额
+            realMoney: this.actualPayment, //实收金额
+            shippingMoney: this.freightNum, //运费
+            remark: this.remark, //备注
+            couponId: this.curCouponId ? this.curCoupon.id : null, //优惠券Id
+            // isSend: this.isSend,
+            couponName:
+              this.curCouponId && this.curCoupon.id
+                ? this.curCoupon.couponEntity.couponName
+                : "", //优惠券名称
+            districtMoney: 0, //优惠金额
+            vipDiscountAmount: this.vipPrice, //折扣金额
+            districtMoney: this.districtAmount, //折扣金额
+  
+            productList: this.goodsDataList.map((e) => {
+              return {
+                productId: e.productId,
+                quantity: e.productAmount
+              };
+            }), //订单列表商品
+            orderType: "order", //订单类型
+            addressId: this.options.goods[0].goodsType != "05" ? this.addressData.id : 0, // 地址ID
+            appName: this.appName,
+            come: this.come,
+          };
+          var productList = [...data.productList];
+          var thisproduct = productList.map((item) => {
+            return item.productId + "_" + item.quantity;
+          });
+          thisproduct = thisproduct.join(",");
+        }
+        if (
+          this.historyOrderInfo &&
+          thisproduct == this.historyOrderInfo.product &&
+          data.addressId == this.historyOrderInfo.addressId &&
+          this.historyOrderInfo.realMoney == data.realMoney
+        ) {
+          that.canjump = false;
+          uni.showModal({
+            title: "提示",
+            content: "您短时间内有一笔相同金额的订单，是否确定继续下单？",
+            cancelText: "点错了",
+            confirmText: "继续操作",
+            success: function (res) {
+              that.canjump = true;
+              if (res.confirm) {
+                that.buyingFlag = false;
+                console.log("用户点击确定", that.buyingFlag);
+                that.submitorder(data);
+              } else {
+                that.buyingFlag = false;
+              }
+            },
+          });
+        } else {
+          that.submitorder(data);
+        }
+      },
+      //支付操作
+      async submitorder(data) {
+        uni.showLoading({
+          title: "正在请求订单",
+        });
+        // this.buyingFlag = false
+        console.log("进来请求了吗？");
+        let that = this;
+        var url = "";
+        switch (that.pageType) {
+          case "fudu":
+            url = that.urlList.renewPayment;
+            // 常规支付
+            break;
+          case "vip":
+            url = that.urlList.vipPayment;
+            // 常规支付
+            break;
+          default:
+            url = that.urlList.buyOrder;
+            // 常规支付
+            break;
+        }
+        await $http
+          .request({
+            url: url,
+            method: "POST",
+            data,
+            header: {
+              "Content-Type": "application/json",
+            },
+          })
+          .then(async (res) => {
+            console.log("res at line 598系统下单返回结果:", res);
+            that.buyingFlag = false;
+            if (!that.options.isFudu && !this.options.isVip) {
+              var product = data.productList.map((item) => {
+                return item.productId + "_" + item.quantity;
+              });
+              product = product.join(",");
+              that.historyOrderInfo = {
+                product: product,
+                addressId: data.addressId,
+                realMoney: data.realMoney,
+              };
+            }
+            if (res.code == 0) {
+              if (res.orderSn == null) {
+                uni.showToast({
+                  title: "失败,请重新下单",
+                  icon: "none",
+                  image: "../../../static/icon/ic_close.png",
+                });
+              } else {
+                uni.showToast({
+                  title: "下单成功，即将进行支付",
+                  icon: "none",
+                });
+                if (that.payType == 2) {
+                  // 常规支付
+                  await setPay(
+                    {
+                      typePay: "alipay",
+                      subject: "order",
+                      totalAmount: res.money,
+                      type: 2,
+                      relevanceoid: res.orderSn,
+                      customerId: that.userInfo.id,
+                    },
+                    (res) => {
+                      uni.showLoading({
+                        title: "加载中",
+                      });
+                      console.log(res, "支付支付");
+                      if (res.success) {
+                        uni.hideLoading();
+                        uni.showToast({
+                          title: "支付成功",
+                        });
+                        setTimeout(() => {
+                          if (that.canjump) {
+                            if (that.goToInfo.type == 1) {
+                              uni.switchTab({
+                                url: `${that.goToInfo.url}?type=order`,
+                              });
+                            } else {
+                              uni.redirectTo({
+                                url: `${that.goToInfo.url}?backType=order`,
+                              });
+                            }
+                          }
+                        }, 1000);
+                      } else {
+                        setTimeout(() => {
+                          console.log("延迟调用 失败提示");
+                          uni.showToast({
+                            title: "支付失败",
+                            image: "../../../static/icon/ic_close.png",
+                          });
+                        }, 0);
+                      }
+                    }
+                  );
+                } else if (that.payType == 1) {
+                  // 微信支付
+                  let data1 = {
+                    orderSn: res.orderSn,
+                    buyOrderId: null,
+                    totalAmount: res.money,
+                  };
+                  setWXPay(data1, (res) => {
+                    if (res.success) {
+                      uni.hideLoading();
+                      uni.showToast({
+                        title: "支付成功",
+                      });
+                      setTimeout(() => {
+                        if (that.canjump) {
+                          if (that.goToInfo.type == 1) {
+                            uni.switchTab({
+                              url: `${that.goToInfo.url}?type=order`,
+                            });
+                          } else {
+                            uni.redirectTo({
+                              url: `${that.goToInfo.url}?backType=order`,
+                            });
+                          }
+                        }
+                      }, 1000);
+                    } else {
+                      uni.hideLoading();
+                      console.log(res, "微信支付111111111111111");
+                      if (res.data.errMsg.indexOf("User canceled") != -1) {
+                        uni.showToast({
+                          title: "用户取消支付",
+                          icon: "none",
+                          image: "../../../static/icon/ic_close.png",
+                        });
+                      } else {
+                        uni.showToast({
+                          title: "支付失败",
+                          icon: "none",
+                          image: "../../../static/icon/ic_close.png",
+                        });
+                      }
+                    }
+                  });
+                } else if (that.payType == 4) {
+                  that.buyingFlag = false;
+                  // 天医币支付
+                  uni.hideLoading();
+                  uni.showToast({
+                    title: "购买成功",
+                    icon: "success",
+                  });
+                  setTimeout(() => {
+                    if (that.canjump) {
+                      if (that.goToInfo.type == 1) {
+                        uni.switchTab({
+                          url: `${that.goToInfo.url}?type=order`,
+                        });
+                      } else {
+                        uni.redirectTo({
+                          url: `${that.goToInfo.url}?backType=order`,
+                        });
+                      }
+                    }
+                  }, 1000);
+                }
+              }
+            }
+          })
+          .catch((e) => {
+            that.buyingFlag = false;
+            uni.hideLoading();
+          });
+      },
+      radioChange(index) {
+        this.selectPayIndex = index;
+        this.payType = this.payList[this.selectPayIndex].type;
+        this.$forceUpdate();
+      },
+      handleValChange(e) {
+        console.log("e at line 424:", e);
+      },
+      buttonClick(e) {
+        console.log(e);
+        this.options[2].info++;
+      },
+  
+      hancleModalConfirm() {
+        var data = {
+          values: {
+            customerType: "D",
+            token: uni.getStorageSync("token"),
+            customerOid: uni.getStorageSync("customerOid"),
+            ...this.taiHuClassInfo,
+          },
+        };
+      },
+      fnRelearn(oid, days, courseFee) {
+        //99和199课程复读一个月60三个月120; 299和399课程复读一个月80三个月180
+        //499和599课程复读一个月90三个月220; 699和799课程复读一个月100三个月248
+        var feeAs = [
+          [60, 120],
+          [80, 180],
+          [90, 220],
+          [100, 248],
+        ];
+        var fee = 0;
+        if (courseFee < 206) {
+          fee = feeAs[0][days == 30 ? 0 : 1];
+        } else if (courseFee < 406) {
+          fee = feeAs[1][days == 30 ? 0 : 1];
+        } else if (courseFee < 606) {
+          fee = feeAs[2][days == 30 ? 0 : 1];
+        } else {
+          fee = feeAs[3][days == 30 ? 0 : 1];
+        }
+        this.modalInfo = {
+          title: "提示信息",
+          content:
+            "用户您好，该课程已到期，通过支付" +
+            fee +
+            "元，本门课程可获得" +
+            days +
+            "天延期学习时间，点击确认即完成自动扣费，感谢配合！",
+        };
+  
+        this.taiHuClassInfo = {
+          taiHuClassOid: oid,
+          days: days,
+          fee: fee,
+        };
+        this.show = true;
+      },
+      async getCourseDescriptionData() {
+        var data = {};
+        var that = this;
+        console.log(this.$store.state, "11111111111");
+        this.$http
+          .post(this.urlList.list, {
+            customerType: "D",
+            token: uni.getStorageSync("token"),
+            customerOid: uni.getStorageSync("customerOid"),
+            oid: this.options.oid,
+          })
+          .then(async (res) => {
+            that.curriculumData = res.obj;
+  
+            if (
+              that.curriculumData.productImageList == null ||
+              that.curriculumData.productImageList == ""
+            ) {
+              this.swiperList.push(that.curriculumData.explainsImg);
+            } else {
+              that.swiperList = that.curriculumData.productImageList.split(",");
+            }
+  
+            that.dataList = res.obj.correlatedList;
+            await that.getDetailInfo();
+          });
+      },
+      getPriceData() {
+        var that = this;
+        setTimeout(() => {
+          that.$nextTick(() => {
+            that.$refs.priceDetail.getTotalPrice();
+          });
+        }, 100);
+      },
+      // 检查是有权限使用搜索功能
+      checkDisable() {
+        console.log("点击了");
+      },
+      // 获取用户详情
+      getUserInfo() {
+        // 用户详情
+        if (this.userInfo.id != undefined) {
+          this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
+            this.userMes = res.user;
+            this.getCateList();
+            console.log(this.userMes, "呼呼");
+          });
+        }
+      },
+  
+      async handleselectCate(item, index) {
+        this.dataList = [];
+        var data = [];
+        console.log(item, index, 99999);
+        var that = this;
+        this.$http
+          .post(this.urlList.curriculumInfo, {
+            customerType: "D",
+            token: uni.getStorageSync("token"),
+            customerOid: uni.getStorageSync("customerOid"),
+            oid: item.coid,
+          })
+          .then(async (res) => {
+            that.curriculumInfo = res.obj;
+            that.dataList = res.obj.courseList;
+          });
+        this.searchValue = "";
+        this.searchList = [];
+        this.showSearchList = false;
+        return data;
+      },
+      async getDetailInfo() {
+        var that = this;
+        this.detailInfo = {
+          content:
+            "<img src='http://oss.taihumed.com/other/null_20210528102528870.jpg' ></img> <img src='http://101.201.146.165:8088/curriculum/detailImg/curriculum_20170420143333621.png'  ></img><p><p>没有中医基础想学中医难不难？中医学者治疗出现瓶颈怎么办？中西医究竟有什么不同呢？吴雄志教授将以全新的视角，完美整合中药学和西医学知识，让你领略当代中医生理学魅力。</p><p><br/><p></p><p><br/></p><p>【思考题】</p><p>1、简述中医的发展这些年出现了哪些变化？</p><p>2、简述中西医学科的异同？</p>",
+        };
+  
+        this.searchValue = "";
+        this.searchList = [];
+        this.showSearchList = false;
+  
+        return data;
+      },
+      async setOneCateIndex(item, index) {
+        this.allDataList = [];
+        console.log(index, 99999);
+        var that = this;
+        this.currentStatusIndex = index;
+        this.searchValue = "";
+        this.searchList = [];
+        this.showSearchList = false;
+        this.$nextTick(async () => {
+          await that.getCourseDescriptionData();
+  
+          this.$forceUpdate();
+        });
+      },
+  
+      transformData(inputData) {
+        const result = {};
+        inputData.forEach((item) => {
+          const { letter } = item;
+          if (!result[letter]) {
+            result[letter] = [];
+          }
+          result[letter].push(item);
+        });
+        return result;
+      },
+      getCateList(id) {
+        id ? "" : (id = 0);
+        this.twoCateList = [];
+        this.curTwoCateIndex = 0;
+      },
+    },
+    onBackPress() {
+      // #ifdef APP-PLUS
+      plus.key.hideSoftKeybord();
+      // #endif
+    },
+  };
+  </script>
+  
+  <style lang="scss" scoped>
+  @import "@/static/mixin.scss";
+  
+  .order_box {
+    padding: 20rpx;
+  
+    .order_top {
+      background-color: #fff;
+      margin-bottom: 20rpx;
+    }
+  
+    .goods_item {
+      width: 100%;
+      overflow: hidden;
+  
+      .textarea {
+        margin-top: 20rpx;
+        background-color: #fffdfd;
+      }
+  
+      .normal_box {
+        width: calc(100% - 160rpx);
+        height: auto;
+        float: right;
+		
+        .normal_box_top {
+          width: 100%;
+          display: flex;
+        }
+      }
+    }
+  }
+  
+  
+  /deep/.textarea textarea{
+	  font-size: 28rpx;
+  }
+  
+  .flexbox {
+    display: flex;
+  }
+  
+  .dataList {
+    height: 100%;
+  }
+  
+  .titleList2 {
+    height: calc(100% - 150rpx);
+  }
+  
+  .priceDetail {
+    height: calc(100% - 180rpx) !important;
+    padding: 0rpx 0;
+    box-sizing: border-box;
+  }
+  
+  .componentPage {
+    height: calc(100% - 90rpx) !important;
+  }
+  
+  .dateReminder {
+    width: 100%;
+    font-size: 24rpx;
+    text-align: right;
+    line-height: 40rpx;
+  }
+  
+  .fdButtonBox {
+    border: 1rpx solid $themeColor;
+    background-color: $themeColor;
+    color: #fff;
+    // width: 100%;
+    float: right;
+    padding: 4rpx 14rpx;
+    font-size: 24rpx;
+    font-weight: 500;
+    line-height: 30rpx;
+    border-radius: 10rpx;
+    box-sizing: border-box;
+  
+    // margin-top: 20rpx;
+    // display: flex;
+    // align-items: center;
+  }
+  
+  .commonDetailPage {
+    font-size: 28rpx;
+    padding-bottom: 150rpx !important;
+  }
+  
+  .goods_box {
+    background-color: #fff;
+    // margin-top: 20rpx;
+    // padding: 40rpx 30rpx;
+    box-sizing: border-box;
+    width: 100%;
+  
+    .title {
+      color: #333;
+      font-weight: 600;
+      margin-bottom: 20rpx;
+    }
+  
+    .curriulum_title_box {
+      width: calc(100%) !important;
+      padding-bottom: 20rpx;
+      background-color: #fff;
+  
+      .curriulum_title {
+        width: calc(100%);
+        font-weight: 500;
+        font-size: 30rpx;
+        margin-top: 10rpx;
+        margin-bottom: 0rpx;
+        color: #333;
+        box-sizing: border-box;
+      }
+    }
+  }
+  
+  .dataList {
+    background-color: #fff !important;
+    padding: 0 30rpx 40rpx !important;
+    box-sizing: border-box;
+  }
+  
+  /deep/.titleItem {
+    // width: calc(100% - 120rpx) !important;
+  }
+  
+  /deep/.scroll-view-item:nth-child(2n-1) {
+    background-color: transparent !important;
+  }
+  
+  .dataList {
+    height: auto !important;
+  }
+  
+  .related_courses_box {
+    background-color: #fff;
+  
+    .small_class_teaching_content {
+      padding: 10rpx 20rpx;
+      box-sizing: border-box;
+    }
+  }
+  
+  .related_courses_name {
+    display: inline-block;
+    width: calc(100% - 150rpx) !important;
+  
+    .aui-text-danger {
+      display: inline-block;
+      float: right;
+    }
+  }
+  
+  .original_price {
+    font-size: 28rpx !important;
+    font-weight: 500;
+    color: #999 !important;
+    white-space: nowrap;
+    text-decoration: line-through;
+    float: left;
+    margin-top: 6rpx;
+  }
+  
+  .price {
+    width: auto;
+    font-size: 30rpx;
+    font-weight: 600;
+    float: right;
+    margin-right: 10rpx;
+    color: #333;
+    // font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
+  }
+  
+  .price_box {
+    width: auto;
+    overflow: hidden;
+    margin-top: 10rpx;
+  }
+  
+  .commonTags {
+    margin-right: 20rpx;
+    margin-top: -5rpx !important;
+  }
+  
+  .sales_number {
+    text-decoration: none;
+    color: #b0b0b0;
+    font-weight: 500;
+  }
+  
+  // .common_curriculum_list{
+  
+  // }
+  /deep/.common_curriculum_list {
+    margin-top: 20rpx;
+    padding: 20rpx 20rpx 20rpx;
+  
+    .content_item {
+      width: 100% !important;
+      margin-bottom: 0 !important;
+      padding: 15rpx 0 0rpx;
+      border-top: 1rpx solid #f1f0f0;
+      // height: 160rpx;
+  
+      .book_image {
+        width: 60rpx !important;
+        height: 60rpx !important;
+        float: left !important;
+        background-color: #f5f5f5;
+      }
+  
+      .common_curriculum_item {
+        width: calc(100% - 88rpx);
+        float: right;
+        display: block !important;
+  
+        // overflow: hidden;
+  
+        .related_courses_name {
+          width: 100% !important;
+        }
+      }
+    }
+  
+    .content_item:nth-child(1) {
+      border-top: none !important;
+    }
+  }
+  
+  /deep/.common_section {
+    padding: 0 !important;
+    padding-bottom: 20rpx !important;
+  }
+  
+  .goods_detail_list_title {
+    display: block;
+    padding-top: 20rpx;
+    padding-bottom: 40rpx;
+  
+    .linlanzhifu {
+      display: flex;
+      align-items: center;
+    }
+  
+    .other_info {
+      font-size: 28rpx;
+      // color: #aaa;
+      color: #5a5a5a;
+  
+      .explain {
+      }
+    }
+  
+    .left {
+      display: flex;
+      align-items: center;
+    }
+  
+    .right {
+      font-size: 24rpx;
+      font-weight: 500 !important;
+      color: #999;
+      font-family: none;
+    }
+  
+    // justify-content: space-between;
+  }
+  
+  .commonPageContentBox {
+    height: auto !important;
+  }
+  
+  .minus {
+    width: 50rpx;
+    height: 50rpx;
+    border-width: 2rpx;
+    border-color: #e6e6e6;
+    border-right-color: transparent;
+  
+    border-top-left-radius: 10rpx;
+    border-bottom-left-radius: 10rpx;
+    border-style: solid;
+    // border-top-left-radius: 100px;
+    // border-top-right-radius: 100px;
+    // border-bottom-left-radius: 100px;
+    // border-bottom-right-radius: 100px;
+    // border-radius:10rpx;
+    @include flex;
+    justify-content: center;
+    align-items: center;
+  }
+  
+  .input {
+    padding: 0 10px;
+    height: 50rpx;
+    border: 1rpx solid #e6e6e6;
+  }
+  
+  .plus {
+    width: 50rpx;
+    height: 50rpx;
+    border-width: 2rpx;
+    border-color: #e6e6e6;
+    border-left-color: transparent;
+    border-style: solid;
+    // background-color: #258feb;
+  
+    border-top-right-radius: 10rpx;
+    border-bottom-right-radius: 10rpx;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    justify-content: center;
+    align-items: center;
+    color: $themeColor;
+  }
+  
+  .order_bottom_box {
+    position: absolute;
+    right: 20rpx;
+  
+    .number {
+      font-size: 28rpx;
+      margin-right: 15rpx;
+      margin-top: 5rpx;
+    }
+  
+    .price {
+      .total {
+        font-size: 30rpx;
+        color: red;
+      }
+    }
+  }
+  
+  /deep/.goods_nav_box {
+    .left {
+      margin-top: -10rpx;
+      width: calc(100% - 220rpx);
+      height: auto;
+      position: relative;
+      // overflow: hidden;
+    }
+  }
+  
+  .explain {
+    word-wrap: break-word;
+    word-break: normal;
+    word-break: break-all; //会断词
+    // white-space: nowrap;
+  }
+  
+  .order_bottom_box {
+    display: flex;
+    align-items: center;
+  }
+  
+  .pay_box {
+    .pay_item {
+      border-bottom: 1rpx solid #eeecec;
+      padding-top: 20rpx;
+      justify-content: space-between;
+  
+      .top {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+      }
+  
+      .left {
+        line-height: 50rpx;
+        font-family: MicrosoftYaHei;
+        font-weight: 500;
+  
+        color: #242323;
+  
+        .pay_item_img {
+          width: 50rpx;
+          height: 50rpx;
+          float: left;
+          margin-right: 20rpx;
+        }
+      }
+  
+      .bottom {
+        width: calc(100% - 60rpx);
+        float: right;
+        // background-color: #dcdfe6;
+        background-color: #f5f5f5;
+        border-radius: 20rpx;
+        margin-top: 20rpx;
+  
+        .jf_box {
+          width: 100%;
+          display: flex;
+          align-items: center;
+          padding: 0 20rpx;
+          box-sizing: border-box;
+          justify-content: space-between;
+          color: #aaa;
+        }
+  
+        .jf_input {
+          width: calc(100% - 320rpx) !important;
+          padding: 10rpx 0;
+          box-sizing: border-box;
+        }
+      }
+    }
+  
+    /deep/.pay_item:nth-last-child(1) {
+      border-bottom: none !important;
+    }
+  }
+  
+  .linlanzhifu {
+    font-size: 28rpx;
+    line-height: 24rpx;
+  }
+  
+  .address_box {
+    display: flex;
+    align-items: center;
+  
+    .order_top {
+      background-color: #fff;
+    }
+  
+    .user_info {
+      width: 100%;
+      display: flex;
+      align-items: center;
+	  padding-top: 6rpx;
+  
+      .name {
+        color: #838282;
+        margin-right: 10rpx;
+      }
+  
+      .tel {
+        color: #838282;
+      }
+    }
+  
+    .curriulum_title {
+      width: auto;
+      font-size: 32rpx;
+      font-weight: 700;
+      margin-right: 10rpx;
+      color: #333;
+      line-height: 38rpx;
+      letter-spacing: 2rpx;
+    }
+  
+    .normal_box {
+      margin-left: 5rpx;
+      width: calc(100% - 120rpx);
+    }
+  
+    .goods_box {
+      padding: 20rpx 20rpx;
+      display: flex;
+      align-items: center;
+    }
+  
+    .rightArrow {
+      margin-left: 40rpx;
+      width: 40rpx;
+      height: 40rpx;
+      // position: absolute;
+      // right: 30rpx;
+    }
+  }
+  
+  .rightArrow {
+    width: 40rpx;
+    height: 40rpx;
+    // position: absolute;
+    // right: 30rpx;
+  }
+  
+  .orderModalShow {
+    width: 100%;
+    max-height: 48vh;
+    padding-bottom: 120rpx;
+  }
+  
+  .popup_box {
+    padding: 20rpx;
+    box-sizing: border-box;
+    .curriulum_title_box {
+      .title {
+        text-align: center;
+        font-size: 34rpx !important;
+      }
+    }
+  }
+  
+  .hasRemark {
+    color: #333 !important;
+  }
+  
+  .minus {
+    width: 22px;
+    height: 22px;
+    border-width: 1px;
+    border-color: #e6e6e6;
+    border-style: solid;
+    border-top-left-radius: 100px;
+    border-top-right-radius: 100px;
+    border-bottom-left-radius: 100px;
+    border-bottom-right-radius: 100px;
+    @include flex;
+    justify-content: center;
+    align-items: center;
+  }
+  
+  .input {
+    padding: 0 10px;
+  }
+  
+  .plus {
+    width: 22px;
+    height: 22px;
+    background-color: #ff0000;
+    border-radius: 50%;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    justify-content: center;
+    align-items: center;
+  }
+  .agree_wo {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    color: #aaa;
+    line-height: 30rpx;
+    font-size: 28rpx;
+    padding: 10rpx 10rpx 20rpx 0;
+  }
+  .agreeRadio {
+    zoom: 0.8;
+  }
+  .agree {
+    width: auto !important;
+  }
+  .highlight {
+    color: $uni-color-primary;
+  }
+  .tanchu {
+    padding: 40rpx 30rpx 40rpx 30rpx;
+    position: relative;
+  
+    .dp_title {
+      font-size: 32rpx;
+      margin-bottom: 50rpx;
+      color: #555;
+      text-align: center;
+      font-weight: bold;
+    }
+  }
+  .themeColor {
+    color: $themeColor;
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/pages/component/commonComponents/selectGoods.vue b/pages/component/commonComponents/selectGoods.vue
index 204b010..6b10a57 100644
--- a/pages/component/commonComponents/selectGoods.vue
+++ b/pages/component/commonComponents/selectGoods.vue
@@ -52,10 +52,13 @@
 					<view
 					  class="related_courses_name"
 					  :class="`goods_item ${
-						selectGoodsData &&
-						selectGoodsData.productId == slotProps.row.productId
-						  ? 'isSelectGoods color_shandow'
-						  : ''
+					   (!isFudu &&
+					      selectGoodsData &&
+					      selectGoodsData.productId == slotProps.row.productId) ||
+					    (isFudu &&
+					      selectGoodsData.productName == slotProps.row.productName)
+					      ? 'isSelectGoods color_shandow'
+					      : ''
 					  }`"
 					>
 					  <view class="image_box" style="margin-right: 10rpx">
@@ -108,7 +111,7 @@ export default {
     "isScroll",
     "selectGoodsData",
     "customButtonGroup1",
-    "buyOptions",
+    "buyOptions", "isFudu", // 是否复读
   ],
   data() {
     return {
diff --git a/pages/curriculum/index/index.vue b/pages/curriculum/index/index.vue
index 0097ef4..d92c333 100644
--- a/pages/curriculum/index/index.vue
+++ b/pages/curriculum/index/index.vue
@@ -10,6 +10,7 @@
 			v-for="(item, index) in dataList" :key="index" 
 			v-if="dataList&&dataList.length>0"
 			@click="goToDetail(item)"
+			:class="item.isStudying==0||item.isStudying==1?'list_item_bt':''"
 			>
 			<view class="list_item_image">
 				<image v-if="item.image" :src="item.image" mode="aspectFit"></image>
@@ -19,7 +20,7 @@
 				<view class="list_item_title">{{item.title}}</view>
 				<view class="list_item_content" v-html="item.content"></view>
 				<view class="list_item_study" v-if="item.isStudying==0" @click.stop="addStudying(item.id)">加入学习</view>
-				<view class="list_item_study_out" v-else @click.stop="removeStudying(item.id)">移出学习</view>
+				<view class="list_item_study_out" v-else-if="item.isStudying==1||currentCateIndex==1" @click.stop="removeStudying(item.id)">移出学习</view>
 			</view>
 		</view>
 		<text v-if="statusNull" class="text_null">暂无数据</text>
@@ -52,14 +53,14 @@ export default {
 		}
 	},
 	onShow(){
+		
+	},
+	onLoad() {
 		//我的课程
 		this.getMyList();
 		this.$nextTick(async () => {
 			await this.ordersTabCLi(this.ordersTabs[0], 0);
 		});
-	},
-	onLoad() {
-		
 	},
 	methods: {
 		//我的课程数据
@@ -170,6 +171,7 @@ export default {
 		},
 		//过期课程数据
 		getExpireList(){
+			this.dataList = [];
 			uni.showLoading({
 				title: '加载中'
 			})
@@ -237,11 +239,15 @@ export default {
 	position: relative;
 	background: #fff;
 	box-shadow: 0px 0px 10px 0px #a7bbe4;
-	padding: 30rpx 20rpx 70rpx;
+	padding: 30rpx 20rpx 30rpx;
 	margin-bottom: 20rpx;
 	display: flex;
 	border-radius: 10rpx;
 }
+
+.list_item_bt{
+	padding: 30rpx 20rpx 70rpx;
+}
 .list_item_image,.image_null{
 	width: 250rpx;
 	height: 220rpx;
diff --git a/pages/curriculum/order/index.vue b/pages/curriculum/order/index.vue
index fe76be2..24820d3 100644
--- a/pages/curriculum/order/index.vue
+++ b/pages/curriculum/order/index.vue
@@ -65,24 +65,27 @@
 								</view>
 							</view>
 							
-							<view class="not_purchased" v-if="slotProps.data.type != 0">
+							<view class="not_purchased" v-if="slotProps.data.type != 0&&!showNewPayBtn[0].status">
 								<view class="spot"></view>
 								<view>
 									<text v-if="userVip==null&&slotProps.data.isBuy!=1">未购买</text>
 									<view v-if="userVip==null&&slotProps.data.isBuy==1">
-										<text v-if="slotProps.data.endTime">课程有效期截止到：<br/>{{slotProps.data.endTime}} </text>
+										<text v-if="slotProps.data.endTime" style=" width: 280rpx; margin: 0;">课程有效期截止到：<br/>{{slotProps.data.endTime}} </text>
 										<text v-else>已购买</text>
 									</view>
 									<text v-if="userVip!=null">有效期至{{ userVip.endTime }}</text>
 								</view>
 							</view>
 							<view class="right">
-								<u-icon v-if="userVip==null&&slotProps.data.type != 0&&slotProps.data.isBuy!=1"
-									@click="handleClickGetGoodsList(slotProps.data)" class="editIcon" name="shopping-cart-fill"
-										color="#FF2B57" size="28"></u-icon>
-								
 								<text v-if="slotProps.data.type == 0&&userVip==null&&slotProps.data.isBuy!=1" style="color: #fff; font-size: 12px" class="fdButtonBox aui-text-success"
 									@click="handleClickGetGoodsList(slotProps.data)">领取课程</text>
+									
+								<text v-else-if="showNewPayBtn[0]&&showNewPayBtn[0].status" style=" background: #f42c32; border: 0; padding: 15rpx 30rpx; color: #fff; font-size: 12px" class="fdButtonBox aui-text-success"
+									@click="goNewPay(slotProps.data)">复读</text>
+									
+								<u-icon v-else-if="userVip==null&&slotProps.data.type != 0&&slotProps.data.isBuy!=1"
+									@click="handleClickGetGoodsList(slotProps.data)" class="editIcon" name="shopping-cart-fill"
+									color="#FF2B57" size="28"></u-icon>
 							</view>
 						</view>
 					</view>
@@ -96,20 +99,51 @@
 							<view class="chapter_content">
 								<courseDescription :isCondition="true" :dataList="slotProps.dataList"
 									@hancleClick="(data, index) => gotoDetail(data, index, slotProps)" label="title">
-									<template slot="labelSlot" slot-scope="slotProps">
-										<view :style="`${
-											slotProps.row.isAudition==1
+									<template slot="labelSlot" slot-scope="slotProps1">
+										<view :style="`${ slotProps1.row.isAudition==1|| slotProps1.row.isLearned==1||slotProps1.row.isLearned==0
 											  ? 'width:calc(100% - 100rpx);float:left;'
 											  : 'width:100%;'}`">
-											<text :class="`${slotProps.row.viewFlg == 1 ? 'aui-text-success' : ''}`">{{ slotProps.row.title }}</text>
+											<text :class="`${slotProps1.row.viewFlg == 1 ? 'aui-text-success' : ''}`">{{ slotProps1.row.title }}</text>
 										</view>
 									</template>
 
-									<template slot="leftSlot" slot-scope="slotProps">
+									<template slot="leftSlot" slot-scope="slotProps1">
 									</template>
-									<template slot="rightSlot" slot-scope="slotProps">
+									<template slot="rightSlot" slot-scope="slotProps1">
 										<text class="fdButtonBox aui-text-success" style="background: none"
-											v-if="slotProps.row.isAudition == 1">试听</text>
+											v-if="slotProps.data.isBuy == 0&&slotProps1.row.isAudition == 1&&userVip==null">试听</text>
+											
+										<template v-if="slotProps.data.isBuy == 1 || userVip!=null">
+											<uni-tag v-if="slotProps1.row.isLearned == 0" style="position: absolute; right: 10rpx; top: 5rpx;"
+												:inverted="true" text="未学" size="mini" type="primary" />
+											<uni-tag v-if="slotProps1.row.isLearned == 1" style="position: absolute; right: 10rpx; top: 5rpx;"
+												:inverted="true" text="已学" size="mini" type="success" />
+										</template>
+											
+										<view class="shitingTag" v-if="slotProps.data.type != 0" style="position: absolute; right: 0; top: 0;">
+										  <u-icon
+											v-if="
+											  slotProps.data.isBuy == 0 &&
+											  userVip == null &&
+											  slotProps1.row.isAudition == 0
+											"
+											name="lock"
+											color="#7dc1f0 "
+											size="22"
+										  ></u-icon>
+										</view>
+										<view class="shitingTag" v-if="slotProps.data.type == 0" style="position: absolute; right: 0; top: 0;">
+										  <u-icon
+										    v-if="
+										      userVip == null &&
+										      slotProps1.row.isAudition == 0 &&
+										      slotProps.data.isBuy == 0
+										    "
+										    name="lock"
+										    color="#7dc1f0 "
+										    size="24"
+										  ></u-icon>
+										</view>
 									</template>
 								</courseDescription>
 							</view>
@@ -141,12 +175,12 @@
 				</view>
 			</template>
 		</common-anchor-link>
-		<common-select-goods ref="commonSelectGoods" :selectGoodsData="selectGoodsData" :goodsList="goodsList"
+		<common-select-goods :isFudu="isFudu"  ref="commonSelectGoods" :selectGoodsData="selectGoodsData" :goodsList="goodsList"
 			:buyOptions="buyOptions" :customButtonGroup1="customButtonGroup1" @selectGoods="handleClickSelectGoods"
 			@onHandleClickBuy="
-        $refs.commonSelectGoods.close();
-        protocolShow = true;
-      "></common-select-goods>
+			$refs.commonSelectGoods.close();
+			protocolShow = true;
+		  "></common-select-goods>
 
 		<u-popup :show="protocolShow" mode="center" round="6">
 			<view class="popup_box">
@@ -257,7 +291,12 @@
 				textList: [],  //转化文字集合
 				//存储解析后的内容
 				parsedContent: '',
-				images: []
+				images: [],
+				
+				isFudu: false,
+				fuduId: null,
+				showNewPayBtn: [],  //复读状态
+				newPaymentProList: [],  //复读列表数据
 			};
 		},
 		onLoad(options) {
@@ -380,7 +419,7 @@
 						"Content-Type": "application/json",
 					},
 				})
-				.then((res) => {						
+				.then(res => {						
 					if (res.code == 0) {
 						this.courseVipModule = res.list;
 						let text = '';
@@ -406,21 +445,48 @@
 					}
 				})
 			},
+			//查询目录续费情况
+			async checkRenewPayment(id) {
+			  var ss = false;
+			  await this.$http
+			    .request({
+			      url: 'common/courseRelearn/courseCatalogueCanRelearn',
+			      method: "POST",
+			      data: {
+			        courseCatalogueId: id,
+			      },
+			      header: {
+			        "Content-Type": "application/json",
+			      },
+			    })
+			    .then(async (res) => {
+			      if (res.code == 0) {
+			        ss = res.canRelearn;
+			      }
+			      this.$forceUpdate();
+			    })
+			    .catch((e) => {
+			      ss = false;
+			      this.$commonJS.showToast(e.errMsg);
+			    });
+			  return ss;
+			},
 			handleClickSelectGoods(data) {
 				this.selectGoodsData = data;
 				this.$forceUpdate();
 			},
 			onHandleClickBuy(e) {
-				var mynavData = {
+				var mynavData = JSON.stringify({
 					goods: [this.selectGoodsData],
 					typeId: 0,
 					navTitle: this.options.navTitle,
 					title: this.options.title,
 					sourceType: "curriculum",
-				};
-				uni.setStorageSync('mynavData', mynavData);
+					isFudu: this.isFudu,
+					fuduId: this.fuduId
+				});
 				uni.navigateTo({
-					url: '/pages/goods/order',
+				  url: `/pages/goods/order?data=${mynavData}`,
 				});
 			},
 			handleClickClose() {
@@ -460,8 +526,54 @@
 					this.getProductListForCourse(v);
 				}
 			},
+			//点击复读
+			async goNewPay(item){
+				await this.getNewPaymentList(item.id) 
+				if(this.newPaymentProList.length > 0){
+					this.goodsList = this.newPaymentProList;
+					this.selectGoodsData = this.goodsList[0];
+					console.log('this.goodsList', this.goodsList)
+					this.$refs.commonSelectGoods.open();
+					this.show = true;
+					this.isFudu = true;
+					//存复读需要的id
+					this.fuduId = item.id;
+				}else{
+					this.show = false;
+					this.isFudu = false;
+					this.$commonJS.showToast('暂无复读方案');	
+				}
+			},
+			async getNewPaymentList(id){
+				uni.showLoading({
+					title:'加载中'
+				})
+				await this.$http
+					.request({
+						url: 'common/courseRelearn/relearnShopProductList',
+						method: "POST",
+						data: {
+							catalogueId: id,
+						},
+						header: {
+							"Content-Type": "application/json",
+						},
+					})
+					.then(async (res) => {
+						console.log("复读列表", res);
+						uni.hideLoading()
+						if(res.code != 0){return this.$commonJS.showToast(res.errMsg);}
+						this.newPaymentProList = res.productList;
+						this.$forceUpdate();
+					}).catch(e => {
+						uni.hideLoading()
+						this.newPaymentProList = []
+						this.$commonJS.showToast(e.errMsg);
+					});
+					
+			},
 			getProductListForCourse(v){
-				this.isFudu = false
+				this.isFudu = false;
 				this.$http.request({
 					url: this.urlList.goodsList,
 					method: "POST",
@@ -489,10 +601,10 @@
 				if(this.userVip){
 					this.goVideo(data);
 				}else{
-					if(data.isAudition == 1||this.cateList[this.currentCateIndex].isBuy == 1){
+					if(data.isAudition == 1||this.cateList[slotProps.index].isBuy == 1){
 						this.goVideo(data);
 					}else{
-						if(this.cateList[this.currentCateIndex].type != 0){
+						if(this.cateList[slotProps.index].type != 0){
 							this.$commonJS.showToast("请先购买课程");
 						}else{
 							this.$commonJS.showToast("请先领取课程");
@@ -537,11 +649,11 @@
 			getCourseDescriptionData() {
 				var data = {};
 				var that = this;
-				this.$http.request({
-					url: this.urlList.list,
+				that.$http.request({
+					url: that.urlList.list,
 					method: "POST",
 					data: {
-						id: this.options.id,
+						id: that.options.id,
 					},
 					header: {
 						"Content-Type": "application/json",
@@ -550,21 +662,28 @@
 				.then(async (res) => {
 					that.curriculumData = res.data.course;
 					that.cateList = [...res.data.catalogues];
+					
 					for (let i = 0; i < that.cateList.length; i++) {
-						var list = await that.getChapterList(that.cateList[i]);
-
-						that.allDataList[i] = {
-							...that.cateList[i],
-							courseList: [...list],
-						};
+					  that.showNewPayBtn[i] = {status:false};
+					  var list = await that.getChapterList(that.cateList[i]);
+					  if (that.cateList[i].isBuy == 0 && that.userVip == null) {
+						that.showNewPayBtn[i].status = await that.checkRenewPayment(that.cateList[i].id);
+						console.log("可以复读吗？", that.showNewPayBtn);
+					  }
+					  
+					  that.allDataList[i] = {
+					    ...that.cateList[i],
+					    courseList: [...list],
+					  };
 					}
+					
 					//获取的数据解析
-					this.removeImagesFromHTML();
+					that.removeImagesFromHTML();
 
 					setTimeout(() => {
 						that.$refs.commonAnchorLink.getDistanceArr();
 					}, 200);
-					this.$forceUpdate();
+					that.$forceUpdate();
 				});
 			},
 		},
@@ -783,11 +902,6 @@
 			}
 		}
 	}
-
-	/deep/.titleItem {
-		// width: calc(100% - 120rpx) !important;
-	}
-
 	/deep/.scroll-view-item:nth-child(2n-1) {
 		background-color: transparent !important;
 	}
@@ -1216,6 +1330,7 @@
 
 		.not_purchased {
 			position: relative;
+			margin-left: 20rpx;
 
 			.spot {
 				width: 8rpx;
@@ -1228,7 +1343,6 @@
 			}
 
 			color: #33435d;
-			margin-left: 20rpx;
 			font-size: 24rpx;
 			border-bottom: 2rpx dotted #33435d;
 
diff --git a/pages/detail/orderLCont.vue b/pages/detail/orderLCont.vue
index 002931a..cdbbd1f 100644
--- a/pages/detail/orderLCont.vue
+++ b/pages/detail/orderLCont.vue
@@ -70,76 +70,121 @@
               class="orderState orderState5"
               v-if="orderContet.orderStatus == 5">已超时</text>
           </view>
-          <view
-            class="orderContent"
-            v-for="(item, index) in goodsList"
-            :key="index"
-            @click="goDetail(item.productId, item)"
-            v-if="goodsList.length > 0"
-			style=" display: flex; align-items: center; justify-content: center;"
-          >
-            <view class="feng" style="position: relative">
-              <view v-if="item.delFlag == -1" class="delisted">已下架</view>
-              <image
-                style="width: 100%; height: 100%"
-                v-if="item.productImages"
-                :src="item.productImages"
-                mode="aspectFit"
-              ></image>
-              <view
-                v-else style="
-                  color: #c0c4cc;
-                  font-size: 22rpx;
-                  line-height: 140rpx;
-                  text-align: center;">暂无封面图</view>
-            </view>
-
-            <view class="goods_info">
-              <view class="flexbox itemJian">
-                <view class="booknameleft">
-                  <text :style="`${item.delFlag == -1 ? 'color:#c0c4cc;' : ''}`">{{ item.productName }}</text>
-                </view>
-                <view style="color: #c0c4cc; font-size: 26rpx; font-weight: 700">
-                  ×{{ item.quantity ? item.quantity : "" }}
-				</view>
-              </view>
-            </view>
-
-            <br clear="both" />
-          </view>
-          <view class="orderContent" v-if="orderContet.orderType == 'vip'" style=" display: flex; align-items: center; justify-content: center;">
-            <image
-              src="/static/icon/vip.png"
-              mode="aspectFill"
-              style="width: 100rpx; height: 100rpx;"
-            ></image>
-            <view class="itemJian">
-              <view class="orderTitle" style="line-height: 46rpx; margin-bottom: 0;">
-                {{ orderContet.vipBuyConfigEntity.title }}
-                <text class="vip_year" v-if="orderContet.vipBuyConfigEntity.year">({{ orderContet.vipBuyConfigEntity.year }}年)</text>
-              </view>
-              <br clear="both" />
-            </view>
-            <br clear="both" />
-          </view>
 		  
-          <view
-            class="orderContent" v-else-if="orderContet.orderType == 'point'">
-            <image
-              src="/static/icon/pay_3.png"
-              mode="aspectFill"
-              style="width: 100rpx; height: 100rpx"
-            ></image>
-            <view class="itemJian">
-              <view class="orderTitle" style="line-height: 100rpx">
-                <text>充值 {{ orderContet.bookBuyConfigEntity.money }}天医币</text>
-              </view>
-              <br clear="both" />
-            </view>
-            <br clear="both" />
-          </view>
+          <view class="order_block">
+			  <view
+			    class="orderContent"
+			    v-for="(item, index) in goodsList"
+			    :key="index"
+			    @click="goDetail(item.productId, item)"
+			    v-if="goodsList.length > 0"
+			  			style=" display: flex; align-items: center; justify-content: center;"
+			  >
+			    <view class="feng" style="position: relative">
+			      <view v-if="item.delFlag == -1" class="delisted">已下架</view>
+			      <image
+			        style="width: 100%; height: 100%"
+			        v-if="item.productImages"
+			        :src="item.productImages"
+			        mode="aspectFit"
+			      ></image>
+			      <view
+			        v-else style="
+			          color: #c0c4cc;
+			          font-size: 22rpx;
+			          line-height: 140rpx;
+			          text-align: center;">暂无封面图</view>
+			    </view>
+			  
+			    <view class="goods_info">
+			      <view class="flexbox itemJian">
+			        <view class="booknameleft">
+			          <text :style="`${item.delFlag == -1 ? 'color:#c0c4cc;' : ''}`">{{ item.productName }}</text>
+			        </view>
+			        <view style="color: #c0c4cc; font-size: 26rpx; font-weight: 700">
+			          ×{{ item.quantity ? item.quantity : "" }}
+			  				</view>
+			      </view>
+			    </view>
+			    <br clear="both" />
+			  </view>
+			  
+			  <view class="orderContent" v-if="orderContet.orderType == 'trainingClass'">
+			    <image
+			      src="/static/icon/icon_pxb.png"
+			      mode="aspectFill"
+			      style="width: 100rpx; height: 100rpx"
+			    ></image>
+			    <view class="itemJian">
+			      <view class="orderTitle" style="line-height: 100rpx">
+			        <text>{{orderContet.remark}}</text>
+			      </view>
+			  
+			      <br clear="both" />
+			    </view>
+			    <br clear="both" />
+			  </view>
+			  <view class="orderContent" v-if="orderContet.orderType == 'relearn'">
+			    <image
+			      src="/static/icon/fugou.png"
+			      mode="aspectFill"
+			      style="width: 100rpx; height: 100rpx"
+			    ></image>
+			    <view class="itemJian">
+			      <view class="orderTitle" style="line-height: 60rpx">
+			        <text>{{ orderContet.remark }}</text>
+			      </view>
+			      <view class="orderPrice">
+			        <text style="font-weight: bold">&nbsp;</text>
+			      </view>
+			      <br clear="both" />
+			    </view>
+			    <br clear="both" />
+			  </view>
+			  
+			  <view class="orderContent" v-if="orderContet.orderType == 'vip'" style=" display: flex; align-items: center; justify-content: center;">
+			    <image
+			      src="/static/icon/vip.png"
+			      mode="aspectFill"
+			      style="width: 100rpx; height: 100rpx;"
+			    ></image>
+			    <view class="itemJian">
+			      <view class="orderTitle" style="line-height: 46rpx; margin-bottom: 0;">
+			        {{ orderContet.vipBuyConfigEntity.title }}
+			        <text class="vip_year" v-if="orderContet.vipBuyConfigEntity.year">({{ orderContet.vipBuyConfigEntity.year }}年)</text>
+			      </view>
+			      <br clear="both" />
+			    </view>
+			    <br clear="both" />
+			  </view>
+			  
+			  <view class="orderContent" v-if="orderContet.orderType == 'aiVip'||orderContet.orderType == 'upgradeAiVip'" style=" display: flex; align-items: center; justify-content: center;">
+			  		<image src="/static/icon/order_vip.png" mode="aspectFill" style="width: 100rpx; height: 100rpx; flex-shrink: 0;"></image>
+			  		<view class="itemJian">
+			  		  <view class="orderTitle" style="line-height: 46rpx; margin-bottom: 0;">
+			  			{{ orderContet.aiBuyConfig.title }}<span style=" color: red;">（{{ orderContet.aiBuyConfig.count }}次）<span v-if="orderContet.orderType=='upgradeAiVip'">（VIP升级）</span></span>
+			  		  </view>
+			  		</view>
+			  </view>
+			  
+			  <view
+			    class="orderContent" v-if="orderContet.orderType == 'point'">
+			    <image
+			      src="/static/icon/pay_3.png"
+			      mode="aspectFill"
+			      style="width: 100rpx; height: 100rpx"
+			    ></image>
+			    <view class="itemJian">
+			      <view class="orderTitle" style="line-height: 100rpx">
+			        <text>充值 {{ orderContet.bookBuyConfigEntity.money }}天医币</text>
+			      </view>
+			      <br clear="both" />
+			    </view>
+			    <br clear="both" />
+			  </view>
+		  </view>
 
-          <view class="order_item" style="">
+          <view class="order_item">
             <view class="orderallpri">
               <span style="color: #666; margin-right: 10rpx; float: left">商品总价 :
               </span>
@@ -271,7 +316,6 @@
               <text style="font-size: 24rpx; color: #666">{{orderContet.paymentDate}}</text>
             </view>
           </view>
-          <view class=""></view>
         </view>
       </view>
     </view>
@@ -534,7 +578,7 @@ export default {
       console.log(item, "item");
       uni.navigateTo({
         url:
-          "./deliverDetail?orderSn=" +
+          "/pages/order/deliverDetail?orderSn=" +
           this.orderContet.orderSn +
           "&expressOrderSn=" +
           item.expressOrderSn +
@@ -713,7 +757,7 @@ export default {
         // 直接展示详情
         uni.navigateTo({
           url:
-            "./deliverDetail?orderSn=" +
+            "/pages/order/deliverDetail?orderSn=" +
             item.orderSn +
             "&expressOrderSn=" +
             this.sheetList[0].expressOrderSn,
@@ -725,7 +769,7 @@ export default {
     },
     onPageJump(item) {
       uni.navigateTo({
-        url: "./deliverDetail?objId=" + item,
+        url: "/pages/order/deliverDetail?objId=" + item,
       });
     },
     OverOrder() {
@@ -1195,16 +1239,15 @@ view,uni-view {
 .orderList {
   padding: 20rpx;
   padding-top: 0;
+  margin-bottom: 120rpx;
 
   .orderItem {
-    padding: 30rpx 0rpx;
+	  padding-top: 30rpx;
     background-color: #fff;
     border-radius: 10rpx;
-    margin-bottom: 30rpx;
 
     .orderContent {
       padding: 20rpx;
-      margin-bottom: 20rpx;
 
       image {
         width: 150rpx;
@@ -1287,6 +1330,9 @@ view,uni-view {
     }
   }
 }
+.order_block .orderContent:last-child{
+	padding-bottom: 30rpx;
+}
 .copyCode {
   display: inline-block;
   margin-left: 20rpx;
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 6914230..669cba8 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -234,7 +234,7 @@
 		</view>
 		<view class="goods_nav_box" v-if="!this.$store.state.loadingShow">
 			<uni-goods-nav :fill="true" :options="buyOptions" :button-group="customButtonGroup1"
-				@click="onHandleClickBuy" @buttonClick="onHandleClickBuy1" />
+				@click="onHandleClick" @buttonClick="onHandleClickBuy1" />
 		</view>
 		<common-select-goods ref="commonSelectGoods" :selectGoodsData="selectGoodsData" :goodsList="goodsList"
 			:buyOptions="buyOptions" :customButtonGroup1="customButtonGroup1" @selectGoods="selectGoods"
@@ -303,8 +303,11 @@
 				parameterList: [],
 				booksList: [],
 				coursesList: [],
-				buyOptions: [],
-
+				buyOptions: [{
+				  icon: "cart",
+				  text: "购物车",
+				}],
+		
 				swiperList: [],
 				goodsList: [],
 				options: {},
@@ -347,12 +350,20 @@
 
 					goodsList: "book/shopproduct/getGlProductList",
 				},
-				customButtonGroup1: [{
-					with: 200,
+				customButtonGroup1: [
+				{
+					text: "加入购物车",
+					backgroundColor: "linear-gradient(90deg, #FFCD1E, #FF8A18)",
+					color: "#fff",
+				},
+				{
 					text: "立即购买",
 					backgroundColor: "linear-gradient(90deg, #FE6035, #EF1224)",
 					color: "#fff",
 				}, ],
+				buttonType: '',  //点击的是加入购物车还是购买
+				cartList: [], // 购物车列表
+				productAmount: 1, // 商品数量
 			};
 		},
 		onLoad(options) {
@@ -413,8 +424,17 @@
 				this.$refs.commonSelectGoods.open();
 				this.$forceUpdate();
 			},
-
-			onHandleClickBuy1() {
+			
+			//点击购物车
+			onHandleClick(){
+				console.log('点击购物车')
+				uni.navigateTo({
+					url: "/pages/goods/shopping",
+				});
+			},
+			//点击筛选商品
+			onHandleClickBuy1(e) {
+				this.buttonType = e.index;
 				if (this.options.type == "visitor") {
 					uni.showModal({
 						content: "登陆后可购买本商品",
@@ -433,22 +453,115 @@
 				}
 				this.$refs.commonSelectGoods.open();
 			},
+			//点击下单按钮
 			onHandleClickBuy() {
-				var mynavData = {
-					goods: [{
-						productImages: this.selectGoodsData.productImages,
-						productId: this.selectGoodsData.productId,
-						productName: this.selectGoodsData.productName,
-						goodsType: this.selectGoodsData.goodsType,
-					}],
-					navTitle: this.options.navTitle,
-					title: this.options.title,
-					typeId: 0
-				};
-				uni.setStorageSync('mynavData', mynavData);
-				uni.navigateTo({
-					url: '/pages/goods/order',
-				});
+				if(this.buttonType==0){  //如果是加入购物车
+					console.log('剩余', this.selectGoodsData.productStock)
+					if(this.selectGoodsData.productStock==0){
+						uni.showToast({
+							title: "商品库存不足",
+							icon: "none",
+							duration: 1000,
+						});
+					}else{
+						this.$http.post(`book/ordercart/getCartList?userId=${this.userInfo.id}`)
+						  .then((res) => {
+						    this.cartList = res.cartList;
+						    this.isAddLink(this.selectGoodsData);
+						  });
+					}
+				}else{  //如果是正常下单
+					var mynavData = JSON.stringify({
+						goods: [{
+							productImages: this.selectGoodsData.productImages,
+							productId: this.selectGoodsData.productId,
+							productName: this.selectGoodsData.productName,
+							goodsType: this.selectGoodsData.goodsType,
+						}],
+						typeId: 0
+					});
+					uni.navigateTo({
+					  url: `/pages/goods/order?data=${mynavData}`,
+					});
+				}
+			},
+			 //统计商品信息
+			isAddLink(item) {
+			  let data = {
+			    userId: this.userInfo.id,
+			    productId: item.productId,
+			    productAmount: this.productAmount,
+			    price: item.price,
+			  };
+			  // 判断列表是否为空
+			  if (this.cartList.length > 0) {
+			    let flag = "";
+			    let shagnpin = {};
+			    // 循环购物车列表
+			    flag = this.cartList.some((item, index) => {
+			      if (item.productId == data.productId) {
+			        shagnpin = item;
+			        shagnpin.productAmount = item.productAmount + 1;
+			        return true;
+			      }
+			    });
+			    if (flag) {
+			      // 已在购物车中添加
+			      $http.request({
+			          url: "book/ordercart/update",
+			          method: "POST",
+			          data: shagnpin,
+			          header: {
+			            "Content-Type": "application/json",
+			          },
+			        })
+			        .then((res) => {
+			          if (res.code == 0) {
+			            uni.showToast({
+			              title: "加入购物车成功",
+			              duration: 1000,
+			            });
+			          }
+			        });
+			    } else {
+			      // 加入购物车
+			      $http.request({
+			          url: "book/ordercart/save",
+			          method: "POST",
+			          data,
+			          header: {
+			            "Content-Type": "application/json",
+			          },
+			        })
+			        .then((res) => {
+			          if (res.code == 0) {
+			            uni.showToast({
+			              title: "加入购物车成功",
+			              duration: 1000,
+			            });
+			          }
+			        });
+			    }
+			  } else {
+			    // 购物车列表为空时直接加入购物车
+			    $http.request({
+			        url: "book/ordercart/save",
+			        method: "POST",
+			        data,
+			        header: {
+			          "Content-Type": "application/json",
+			        },
+			      })
+			      .then((res) => {
+			        if (res.code == 0) {
+			          uni.showToast({
+			            title: "加入购物车成功",
+			            duration: 1000,
+			          });
+			        }
+			      });
+			  }
+			  this.$refs.commonSelectGoods.close();
 			},
 			buttonClick(e) {
 				console.log(e);
@@ -1276,4 +1389,9 @@
 		align-items: center;
 		justify-content: space-between;
 	}
+	
+	/deep/.uni-tab__text{
+		font-size: 26rpx;
+		line-height: 28rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/goods/order.vue b/pages/goods/order.vue
index a7528a1..f7a19b9 100644
--- a/pages/goods/order.vue
+++ b/pages/goods/order.vue
@@ -1,1599 +1,376 @@
 <template>
-	<view class="commonPageBox commonDetailPage">
-		<z-nav-bar title="确认订单"></z-nav-bar>
-		<view class="contentBox commonPageContentBox order_box">
-			<view v-show="isShowAddress" class="order_top common_radius_box color_shandow goods_box address_box"
-				@click="goToAddress">
-				<u-icon name="map-fill" color="#7dc1f0" size="20"
-					style="display: inline-block; margin-right: 10rpx"></u-icon>
-				<view class="normal_box" v-if="addressData.consigneeName">
-					<view class="normal_box_top">
-						<view class="curriulum_title">{{ addressData.address }} </view>
-						<view class="user_info">
-							<text class="name"> {{ addressData.consigneeName }} </text>
-							<text class="tel"> {{ addressData.consigneePhone }} </text>
-						</view>
-					</view>
-				</view>
-				<view class="normal_box" v-else>
-					<view class="normal_box_top">
-						<view class="curriulum_title">请添加收货地址 </view>
-					</view>
-				</view>
-				<view class="right">
-					<image src="@/static/icon/icon_right.png" class="rightArrow" style=""></image>
-				</view>
-			</view>
+  <view class="container commonPageBox commonDetailPage" style=" padding: 0;">
+    <z-nav-bar title="确认订单"></z-nav-bar>
 
-			<view class="order_top common_radius_box color_shandow goods_box">
-				<view class="curriulum_title_box goods_item" style=" position: relative;" v-for="(v, i) in goodsDataList">
-					<text class="goods_item_vip" v-if="v.isVipPrice==1&&v.vipPrice!=null&&v.vipPrice!=0">VIP优惠</text>
-					<image class="goods_item_img" :src="v.productImages" mode="aspectFit">
-					</image>
-					<view class="normal_box">
-						<view class="normal_box_top">
-							<view class="curriulum_title">{{ v.productName }} </view>
-							<view class="price_box">
-								<view class="vip_price" v-if="v.isVipPrice==1&&v.vipPrice!=null&&v.vipPrice!=0">
-									<text class="vip_price_jg">￥{{ v.vipPrice }}</text>
-									<text class="vip_price_text">VIP到手价</text>
-									<text class="vip_price_line">￥{{ v.price }}</text>
-								</view>
-								<text class="price" v-else-if="v.activityPrice&&v.activityPrice>0">
-									<text class="vip_price_jg">￥{{ v.activityPrice }}</text>
-									<text class="vip_price_text">活动价</text>
-									<text class="vip_price_line">￥{{ v.price }}</text>
-								</text>
-								<text v-else>￥{{ v.price }}</text>
-								
-								<view>
-									x 1
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="pay_box" style="margin-top: 20rpx">
-					<view @click="openOrderModal(v)" class="curriulum_title_box goods_item pay_item"
-						v-for="(v, i) in orderInfoList">
-						<view class="top">
-							<view class="left">
-								<text> {{ v.text }}</text>
-							</view>
-							<view class="right" style="display: flex; align-items: center">
-								<text style="
-									float: left;
-									text-align: right;
-									color: #b0b0b0;
-									font-size: 28rpx;
-									display: inline-block;
-									width: 200rpx;
-								  " :class="remark ? 'hidden1 hasRemark' : 'hidden1'">
-									{{ remark == "" ? v.placeholder : remark }}</text>
-								<image src="@/static/icon/icon_right.png" class="rightArrow" style=""></image>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
+    <common-order-submit
+      v-if="showOrder"
+      :options="options"
+     
+      :urlList="urlList"
+      :initData="initData"
+      :priceKey="priceKey"
+      :pageType="pageType"
+      :goodsDataList="goodsDataList"
+      :showNumber="showNumber"
+      :isHideAddress="isHideAddress"
+    >
+      <template
+        slot="goodsLableInfoSlot"
+        slot-scope="slotProps"
+        v-if="pageType == 'goods'"
+      >
+        <span
+          class="goodsvipLabel"
+          v-if="
+            slotProps.row.isVipPrice == 1 &&
+            slotProps.row.vipPrice != 0 &&
+            slotProps.row.vipPrice != null
+          "
+          style=""
+          >VIP优惠</span
+        >
+      </template>
+      <template slot="goodsInfoImgSlot" slot-scope="slotProps">
+        <image
+          v-if="pageType == 'vip'"
+          src="/static/icon/vip.png"
+          class="goods_item_img"
+          mode="widthFix"
+          @click="goDetail(slotProps.row.productId)"
+        ></image>
+        <image
+          v-else-if="
+            (pageType == 'goods' || pageType == 'fudu') &&
+            slotProps.row.productImages &&
+            slotProps.row.productImages != ''
+          "
+          class="goods_item_img"
+          :src="slotProps.row.productImages"
+          mode="aspectFit"
+        >
+        </image>
 
-			<view class="order_top common_radius_box color_shandow goods_box pay_box">
-				<view class="title">价格明细</view>
+        <image
+          v-else
+          src="/static/nobg1.jpg"
+          class="goods_item_img"
+          mode="widthFix"
+          @click="goDetail(slotProps.row.productId)"
+        ></image>
+      </template>
+      <template slot="goodsInfoNameSlot" slot-scope="slotProps">
+        <span v-if="pageType == 'vip'"
+          >{{ slotProps.row.title
+          }}<span style="margin-left: 4rpx"
+            >{{ slotProps.row.year }}年</span
+          ></span
+        >
+        <span v-else>{{ slotProps.row.productName }}</span>
+      </template>
+      <template slot="goodsInfoPriceSlot" slot-scope="slotProps">
+        <text
+          v-if="
+            slotProps.row.isVipPrice == 1 &&
+            slotProps.row.vipPrice != 0 &&
+            slotProps.row.vipPrice != null
+          "
+        >
+          <text style="color: #e97512; font-size: 28rpx; font-weight: bold"
+            >￥{{ slotProps.row.vipPrice.toFixed(2) }}</text
+          >
+          <text style="color: #fa2d12; font-size: 24rpx; margin-left: 4px"
+            >VIP到手价</text
+          >
+          <text
+            style="
+              color: #8a8a8a;
+              font-size: 24rpx;
+              margin-left: 4px;
+              font-weight: bold;
+              text-decoration: line-through;
+            "
+            >￥{{ Number(slotProps.row.price).toFixed(2) }}</text
+          >
+        </text>
 
-				<view class="curriulum_title_box goods_item pay_item" v-for="(v, i) in priceBreakdownList">
-					<view class="top">
-						<view class="left" style="display: flex; align-items: center;">
-							<image v-if="v.imgUrl" class="pay_item_img_icon" :src="v.imgUrl" mode="aspectFil"
-								:style="v.style">
-							</image>
-							<u-icon v-if="v.icon" name="map-fill" color="#018F89" size="20"
-								style="display: inline-block"></u-icon>
-							<template v-if="v.type == 3">
-								<text style="color: #aaa; margin-left: 10rpx">
-									(全部积分：{{ initData.user.jf }})</text>
-							</template>
-							<template v-else-if="v.type == 5">
-								<text class="type_text_red">活动立减</text>
-							</template>
-							
-							<template v-else-if="v.type == 6">
-								<text class="type_text_red">VIP专享立减</text>
-							</template>
-							<text v-else>{{ v.text }}</text>
-						</view>
-						<view class="right">
-							<template v-if="v.type == 1"> ￥{{ totalPrice }}</template>
-							<template v-if="v.type == 2">
-								<text>
-									￥{{ isShowAddress ? freightNum.toFixed(2) : Number(0).toFixed(2) }}</text>
-							</template>
-							<template v-if="v.type == 3">
-								<text style="color: #fe6035"> -￥{{ jfNumberShow }}</text>
-							</template>
-							<template v-if="v.type == 5">
-								<text class="type_text_red">-￥{{districtAmount}}</text>
-							</template>
-							<template v-if="v.type == 6">
-								<text class="type_text_red">-￥{{vipPrice}}</text>
-							</template>
-						</view>
-					</view>
+        <text
+          v-else-if="
+            slotProps.row.activityPrice && slotProps.row.activityPrice > 0
+          "
+        >
+          <text style="color: #e97512; font-size: 28rpx; font-weight: bold"
+            >￥{{ slotProps.row.activityPrice.toFixed(2) }}</text
+          >
+          <text style="color: #613804; font-size: 24rpx; margin-left: 4px"
+            >活动价</text
+          >
+          <text
+            style="
+              color: #8a8a8a;
+              font-size: 24rpx;
+              margin-left: 4px;
+              font-weight: bold;
+              text-decoration: line-through;
+            "
+            >￥{{ Number(slotProps.row.price).toFixed(2) }}</text
+          >
+        </text>
 
-					<view class="bottom jf_box" v-if="v.type == 3">
-						<view class="jf_box">
-							<text style="color: #7dc1f0; font-weight: 600">可用积分({{ jfNumberMax }}分)</text>
-							<view class="jf_input">
-								<u--input type="number" @input="handleChangejf" @clear="jfNumber = 0" :max="jfNumberMax"
-									v-model="jfNumber" placeholder="请输入积分" border="surround" clearable></u--input>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="order_top common_radius_box color_shandow goods_box pay_box">
-				<view class="title">支付方式</view>
-
-				<view class="curriulum_title_box goods_item pay_item" v-for="(v, i) in payList">
-					<view :class="isDefaultCurrency && i != 2 ? 'bgGrey top' : 'top'">
-						<view class="left">
-							<image class="pay_item_img" :src="v.imgUrl" mode="aspectFil" :style="v.style">
-							</image>
-							<template v-if="v.type == 4">
-								<text> {{ v.text }}</text>
-								<text style="color: #7dc1f0; font-weight: 600; margin-left: 10rpx">
-									(余额：{{
-                    initData && initData.user ? initData.user.peanutCoin : 0
-                  }})</text>
-							</template>
-
-							<text v-else> {{ v.text }}</text>
-						</view>
-						<template v-if="isDefaultCurrency">
-							<radio :value="v.value" color="#7dc1f0" v-if="i == 2"
-								:checked="selectPayIndex == i ? true : false" @click="radioChange(i)" size="10" />
-						</template>
-						<template v-else>
-							<radio :value="v.value" color="#7dc1f0" :checked="selectPayIndex == i ? true : false"
-								@click="radioChange(i)" size="10" />
-						</template>
-					</view>
-				</view>
-				<template v-if="selectPayIndex == 2 || $platform == 'ios'">
-					<view class="goods_detail_list_title bg_box_shandow color_shandow bg_color">
-						<view class="linlanzhifu" style="
-                width: 100%;
-                overflow: hidden;
-                justify-content: space-between;
-              ">
-							<view class="linlanzhifu">
-								<u-icon name="error-circle" color="#7dc1f0" size="20"
-									style="display: inline-block; margin-right: 10rpx"></u-icon>
-								确保您的天医币足够支付
-							</view>
-
-							<text class="fdButtonBox aui-text-danger fdButtonBoxRed" style="float: right" @click="
-                  onPageJump('/pages/wallet/recharge?source=order')
-                ">立即充值</text>
-						</view>
-
-						<view class="other_info" style="margin-top: 12rpx">
-							<view class="explain" style="margin-bottom: 10rpx"> 说明 </view>
-							<view class="explain"> 1. 1天医币 = 1元人民币 </view>
-							<view class="explain">
-								2.若有疑问或意见请致电客服
-								<span style="font-size: 15px"><u @click="checkPermision">022-24142321</u></span>
-							</view>
-							<view class="explain">
-
-								3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！
-								支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱
-								<text @click="fnCopy('publisher@tmrjournals.com', '邮箱')" class="aui-text-success"
-									style="text-decoration: underline; color: #7dc1f0">
-									publisher@tmrjournals.com
-								</text>
-								（点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（
-								<text class="aui-text-success" @click="fnCopy('yilujiankangkefu', '微信名')"
-									style="text-decoration: underline; color: #7dc1f0">
-									yilujiankangkefu </text>）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。
-							</view>
-						</view>
-					</view>
-				</template>
-			</view>
-
-			<template>
-				<common-sticky label="title" :itemStyle="`width:${
-            cateList.length == 2 ? '50' : '33'
-          }%;padding-left: 15px; padding-right: 15px; height: 68rpx;`" :list="cateList"
-					:currentCateIndex="currentCateIndex" @handleselectCate="handleselectCate">
-				</common-sticky>
-			</template>
-		</view>
-		<view class="goods_nav_box">
-			<common-goods-nav :iconList="[]" :customButton="customButton" @submit="goBuyJie">
-				<!-- leftSlot -->
-				<template slot="leftSlot" slot-scope="slotProps">
-					<view class="price_box order_bottom_box">
-						<text class="price">合计：
-							<text class="total" v-if="actualPayment==0">{{jfNumber}}积分</text>
-							<text class="totacl" v-else>
-								<span style=" color: red;">￥{{actualPayment}}</span>
-								<text style="margin: 0 4rpx;" v-if="actualPayment>0&&jfNumber>0">
-								+
-								</text>
-						    
-								<text v-if="jfNumber>0">{{ jfNumber }} 积分</text>
-						    </text>
-						</text>
-					</view>
-				</template>
-			</common-goods-nav>
-		</view>
-		<u-popup :show="show" mode="right">
-			<common-address backState="3000" ref="commonAddress" @fresh="handleFresh"
-				@selectAddress="selectAddress"></common-address></u-popup>
-		<u-popup :show="orderModalShow" mode="bottom" :round="20">
-			<view class="orderModalShow popup_box">
-				<u-icon name="close" color="#333" size="18" @click="closeOrderModalShow" style="
-            display: inline-block;
-            position: absolute;
-            right: 20rpx;
-            top: 20rpx;
-          "></u-icon>
-				<view v-if="orderModalShowInfo.type == 'remark'">
-					<view class="order_top common_radius_box goods_box">
-						<view class="curriulum_title_box goods_item">
-							<view class="title">订单备注</view>
-							<u--textarea v-model="content" placeholder="选填：给商家留言" count class="textarea"></u--textarea>
-						</view>
-					</view>
-				</view>
-				<view class="goods_nav_box">
-					<uni-goods-nav :fill="true" :options="[]" :button-group="customButtonGroup1"
-						@click="onHandleClickBuy" @buttonClick="onHandleClickBuy" />
-				</view>
-			</view>
-		</u-popup>
-	</view>
+        <text v-else style="font-size: 28rpx"
+          >￥{{ Number(slotProps.row.price).toFixed(2) }}</text
+        >
+      </template>
+    </common-order-submit>
+  </view>
 </template>
 
 <script>
-	import debounce from "@/common/debounce.js";
-	import {
-		setPay,
-		setPayAssign,
-		setWXPay
-	} from "@/config/utils";
-	import $http from "@/config/requestConfig.js";
-	import permission from "@/js_sdk/wa-permission/permission.js"
-	const { platform } = uni.getSystemInfoSync();
-	import {
-		mapState
-	} from "vuex";
-import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
-	export default {
-		watch: {
-			isDefaultCurrency: {
-				immediate: true,
-				handler(newRoute) {
-				  if (this.isDefaultCurrency) {
-				    if (platform == "ios") {
-				      this.selectPayIndex = 0;
-				    } else {
-				      this.selectPayIndex = 0;
-				    }
-				  } else {
-				    if (platform == "ios") {
-				      this.selectPayIndex = 0;
-				    } else {
-				      this.selectPayIndex = 0;
-				    }
-				  }
-				
-				  this.payType = this.payList[this.selectPayIndex].type;
-				  if (this.actualPayment == 0) {
-				    var that = this;
-				    this.payList.forEach((e, i) => {
-				      if (e.type == 4) {
-				        that.selectPayIndex = i;
-				        that.payType = 4;
-				      }
-				    });
-				    this.$forceUpdate();
-				  }
-				  this.$forceUpdate();
-				},
-			},
-		},
-		data() {
-			return {
-				isDefaultCurrency: false,
-				isShowAddress: false,
-				jfNumber: 0,
-				totalPrice: 0,
-				actualPayment: 0,
-				jfNumberShow: "",
-				jfNumberMax: 0,
-				goodsDataList: [],
-				orderModalShowInfo: {},
-				orderModalShow: false,
-				payType: 1,
-				freightNum: 0,
-				addressData: {
-					address: "",
-					consigneeName: "",
-					consigneePhone: "",
-				},
-				selectPayIndex: 1,
-				farePrice: 0,
-				payList: [],
-				priceBreakdownList: [],
-				orderInfoList: [{
-					text: "订单备注",
-					placeholder: "填写订单备注",
-					imgUrl: "",
-					type: "remark",
-				}, ],
-				number: 1,
-				detailInfo: {},
-				content: "",
-				remark: "",
-				iconList: [],
+import { mapState } from "vuex";
+export default {
+  components: {},
+  watch: {},
+  data() {
+    return {
+      priceKey: "price",
+      showNumber: true,
+      isHideAddress: false,
+      options: {},
+      initData: {},
+      goodsDataList: [],
+      pageType: "",
+      showOrder: "",
+      urlList: {
+        list: "app/phone.do?getCourseDetail_new",
+        initPrepareOrder: "common/buyOrder/initPrepareOrder",
+        buyOrder: "book/buyOrder/placeOrder",
+        curriculumInfo: "app/phone.do?getCourseInfo",
+        detailInfo: "app/phoneDoctor.do?getTaiHuClassInfo_new",
+        userInfo: "common/user/getUserInfo",
+        addressList: "common/userAddress/getUserAddress",
+        freightNum: "book/buyOrder/calculateTransportPrice", //运费
+        renewPayment: "common/courseRelearn/relearnSave", // 复读下单地址
+        vipPayment: "common/userVip/placeVipOrder", // 复读下单地址
+      },
+    };
+  },
+  async onLoad(options) {
+    this.options = JSON.parse(options.data);
+    this.priceKey = "price";
+    this.showNumber = true;
+    this.isHideAddress = false;
 
-				swiperList: [],
-				options: {},
-				relatedCoursesList: [], //相关课程
-				curriculumData: {},
-				curriculumInfo: {},
-				detailInfo: {},
-				fdButtonStyle: {
-					width: "120rpx",
-					"border-color": "#3AB3AE",
-					color: "#3AB3AE",
-					float: "right",
-					"margin-right": "20rpx",
-					"margin-left": "30rpx",
-				},
-				modalInfo: {},
-				currentCateIndex: 0,
-				show: false,
-				playData: {},
-				initData: {},
-				taiHuClassInfo: {},
-				searchValue: "",
-				cateList: [], // 一级分类标题1
-				twoCateList: [], // 二级分类标题
-				dataList: [], // 方剂标题
-				defaultAddressList: {},
-				allDataList: [], // 方剂标题
-				currentStatusIndex: 0, // 当前选中的一级分类
+    await this.init();
+    if (this.options.isFudu) {
+      //复读订单
+      this.pageType = "fudu";
+      this.showNumber = true;
 
-				curTwoCateIndex: 0, // 当前选中的二级分类
-				searchList: [], // 搜索结果数组
-				showSearchList: false,
-				userMes: {}, // 用户信息
-				searchDisable: false, // 搜索不可用
-				limitShow: false,
-				limitTitle: "提示",
-				goToInfo: {},
-				limitContent: "",
-				scrollViewHeight: 0,
-				urlList: {
-					list: "app/phone.do?getCourseDetail_new",
-					initPrepareOrder: "common/buyOrder/initPrepareOrder",
-					buyOrder: "book/buyOrder/placeOrder",
-					curriculumInfo: "app/phone.do?getCourseInfo",
-					detailInfo: "app/phoneDoctor.do?getTaiHuClassInfo_new",
-					addressList: "common/userAddress/getUserAddress",
-					freightNum: "book/buyOrder/calculateTransportPrice", //运费
-				},
-				customButton: [{
-					width: "300rpx",
-					text: "立即支付",
-					backgroundColor: "linear-gradient(90deg, #294a97 0%, #7dc1f0 80%)",
-					color: "#fff",
-				}, ],
-				customButtonGroup1: [{
-					with: 200,
-					text: "确定",
-					backgroundColor: "linear-gradient(90deg, #294a97 0%, #7dc1f0 80%)",
-					color: "#fff",
-				}, ],
-				//立减金额
-				districtAmount: 0,
-				vipPrice: 0,
-				orderNumber: 1,  //商品数量
-			};
-		},
-		async onLoad(options) {
-			var that = this;
-			var mynavData = uni.getStorageSync('mynavData');
-			this.options = mynavData;
-			if (this.options.sourceType == "curriculum") {
-				this.goToInfo = {
-					url: "/pages/curriculum/index/index",
-					type: 2,
-				};
-			} else {
-				this.goToInfo = {
-					url: "/pages/order/index",
-					type: 1,
-				};
-			}
-			that.getData();
-		},
-		async onShow() {
-			var that = this;
-			await uni.$on("returnData", function(data) {
-				if (data) {
-					that.addressData = {
-						...data,
-						address: `${data.province}${data.city}${data.county}${data.detailAddress}`,
-						consigneeName: data.consigneeName,
-						consigneePhone: data.consigneePhone,
-					};
-					that.$forceUpdate();
-					that.getUserAddress();
-				} else {
-					
-				}
+      await this.getFuduDataInfo();
+    } else {
+      //普通
+
+      this.pageType = "goods";
+
+      await this.getGoodsDataInfo();
+    }
+
+    this.$nextTick(async () => {
+      this.showOrder = true;
+    });
+  },
+
+  computed: { ...mapState(["userInfo"]) },
+  methods: {
+    async init() {
+      if (this.options.isVip) {
+        await this.$http
+          .request({
+            url: `${this.urlList.userInfo}`,
+            method: "POST",
+            data:{},
+            header: {
+              "Content-Type": "application/json",
+            },
+          })
+
+          .then(async (res) => {
+            console.log("res at line 1168:", res);
+            if (res.code == 0) {
+              this.initData = {user:res.result};
+
+              this.isHideAddress = true;
+            }
+
+            this.$forceUpdate();
+          });
+      } else {
+        var data = {
+          uid: this.userInfo.id,
+          productList: this.options.goods.map((e) => {
+            return {
+              productId: e.productId || e.id,
+              quantity: e.productAmount,
+            };
+          }),
+        };
+
+        var that = this;
+
+        await this.$http
+          .request({
+            url: `${this.urlList.initPrepareOrder}`,
+            method: "POST",
+            data,
+            header: {
+              "Content-Type": "application/json",
+            },
+          })
+
+          .then(async (res) => {
+            console.log("res at line 1168:", res);
+            if (res.code == 0) {
+              this.initData = res.data;
+
+              console.log(
+                "this.initData at line 初始化课程订单信息:",
+                this.initData
+              );
+              if (res.data.is_course) {
+                this.isHideAddress = true;
+              }
+            }
+
+            this.$forceUpdate();
+          });
+      }
+    },
+    findById(id, data) {
+      // Loop through the data array
+      for (const item of data) {
+        // Check if vcbList exists and loop through each item in vcbList
+        if (item.vcbList) {
+          this.isHideJf=true
+          const vcbItem = item.vcbList.find((vcb) => vcb.id === id);
+          if (vcbItem) {
+            return {...vcbItem,}; // Return the matching item
+          }
+        }
+        if (item.yanqiList) {
+          this.isHideJf=false
+          const vcbItem = item.yanqiList.find((vcb) => vcb.id === id);
+          if (vcbItem) {
+            
+            return {...vcbItem,}; // Return the matching item
+          }
+        }
+      }
+      return null; // Return null if no item with the given ID is found
+    },
+
+    async getFuduDataInfo() {
+      await this.$http
+        .request({
+          url: "/common/courseRelearn/relearnShopProductList",
+          method: "POST",
+          data: {
+            catalogueId: this.options.fuduId,
+          },
+          header: {
+            "Content-Type": "application/json",
+          },
+        })
+        .then(async (res) => {
+          this.goodsDataList = res.productList.filter(
+            (e) => this.options.goods[0].productName == e.productName
+          );
+         
+        });
+    },
+
+    async getVipDataInfo() {
+      await this.$http
+        .request({
+          url: "/common/userVip/getVipBuyConfigList",
+          method: "POST",
+          data: {},
+          header: {
+            "Content-Type": "application/json",
+          },
+        })
+        .then(async (res) => {
+          console.log("res at line 846:", res);
+          var data = await this.findById(this.options.goods[0].id, res.res);
+          if(this.isHideJf){
+            this.initData.user.jf=0;
+          }
+          console.log("data at line 200:", data);
+          this.goodsDataList = [
+            {
+              ...data,
+              productId: data.id,
+              price: data.rebateFee,
+            },
+          ];
+          console.log("this.goodsDataList at line 861:", this.goodsDataList);
+        });
+    },
+    async getGoodsDataInfo(fn) {
+      await this.$http
+        .request({
+          url: "/book/buyOrder/getShopProductListByIds",
+          method: "POST",
+          data: {
+            productIds: this.options.goods.map((e) => e.productId).toString(),
+          },
+          header: {
+            "Content-Type": "application/json",
+          },
+        })
+        .then(async (res) => {
+			res.shopProductList.forEach(product => {
+			  const cartItem = this.options.goods.find(item => item.productId === product.productId);
+			  product.productAmount = cartItem ? cartItem.productAmount : 1;
 			});
-			if (platform == "ios") {
-				that.payList = [
-					{
-						text: "天医币",
-						imgUrl: require("@/static/icon/pay_3.png"),
-						type: 4,
-						value: "2",
-					},
-				];
-			  that.selectPayIndex = 0;
-			  that.payType = 4;
-			} else {
-				that.payList = [
-					{
-						text: "支付宝",
-						imgUrl: require("@/static/icon/pay_1.png"),
-						type: 2,
-						value: "0",
-					},
-					{
-						text: "微信",
-						imgUrl: require("@/static/icon/pay_2.png"),
-						type: 1,
-						value: "1",
-					},
-					{
-						text: "天医币",
-						imgUrl: require("@/static/icon/pay_3.png"),
-						type: 4,
-						value: "2",
-					},
-				];
-				that.selectPayIndex = 1;
-				that.payType = 1;
-			}
-		},
-		computed: {
-			...mapState(["userInfo"]),
-		},
-		methods: {
-			//获取数据
-			async getData(){
-				this.$http.request({
-					url: 'book/buyOrder/getShopProductListByIds',
-					method: "POST",
-					data: {
-						productIds: this.options.goods[0].productId.toString()
-					},
-					header: {
-						"Content-Type": "application/json",
-					},
-				})
-				.then(async (res) => {
-					if (res.code == 0) {
-						this.goodsDataList = res.shopProductList;
-						//请求VIP还是活动的逻辑
-						if(this.goodsDataList[0].isVipPrice==1&&
-						   this.goodsDataList[0].vipPrice!=null&&
-						   this.goodsDataList[0].vipPrice!=0){
-							await this.getVipDiscountAmount();
-						}else if(this.goodsDataList[0].activityPrice&&
-						  this.goodsDataList[0].activityPrice>0){
-							await this.getDistrictAmount();
-						}else{
-							await this.initPrepareOrder();
-						}
-					}
-				});
-			},
-			//VIP立减
-			async getVipDiscountAmount(){
-				let data = [];
-				this.goodsDataList.forEach((item, index) => {
-					data.push({
-						productId: item.productId,
-						quantity: this.orderNumber,
-					});
-				});
-				this.$http.request({
-					url: 'book/buyOrder/getVipDiscountAmount',
-					method: "POST",
-					data: {
-						productList: data
-					},
-					header: {
-						"Content-Type": "application/json",
-					},
-				})
-				.then(async (res) => {
-					if (res.code == 0) {
-						this.vipPrice = res.discountAmount;
-						await this.initPrepareOrder();
-					}
-				});
-			},
-			//活动立减
-			async getDistrictAmount(){
-				let data = [];
-				this.goodsDataList.forEach((item, index) => {
-					data.push({
-						productId: item.productId,
-						quantity: this.orderNumber,
-					});
-				});
-				this.$http.request({
-					url: 'book/buyOrder/getDistrictAmount',
-					method: "POST",
-					data: {
-						productList: data
-					},
-					header: {
-						"Content-Type": "application/json",
-					},
-				})
-				.then(async (res) => {
-					if (res.code == 0) {
-						this.districtAmount = res.districtAmount;
-						await this.initPrepareOrder();
-					}
-				});
-			},
 			
-			handleChangejf(val) {
-				var value = val;
-				this.$nextTick(() => {
-					if (val == 0) {
-						this.jfNumber = 0;
-						this.jfNumberShow = "0.00";
-					} else {
-						if (value >= this.jfNumberMax) {
-							value = this.jfNumberMax;
-
-							this.$forceUpdate();
-						} else {}
-						this.jfNumber = Number(value);
-						this.jfNumberShow = this.jfNumber.toFixed(2);
-					}
-
-					this.actualPayment = this.totalPrice - this.jfNumber - this.vipPrice - this.districtAmount + this.freightNum;
-
-					// 如果实际支付金额为0，设置支付方式为默认货币
-					if (this.actualPayment == 0) {
-						console.log("this.actualPayment at line 1097:", this.actualPayment);
-					  this.isDefaultCurrency = true;
-					  this.payList.forEach((e, i) => {
-					    if (e.type == 4) {
-					      this.selectPayIndex = i;
-					      this.payType = 4;
-					    }
-					  });
-					  this.$forceUpdate();
-					} else {
-					  this.isDefaultCurrency = false;
-					}
-					this.$forceUpdate();
-				});
-			},
-			onHandleClickBuy() {
-				this.orderModalShow = false;
-				this.remark = this.content;
-			},
-			closeOrderModalShow() {
-				if (this.orderModalShowInfo.type == "remark") {
-					this.content = "";
-				}
-				this.orderModalShow = false;
-			},
-			onPageJump(url) {
-				uni.navigateTo({
-					url: url,
-				});
-			},
-			//获取订单初始数据
-			async initPrepareOrder() {
-				this.priceBreakdownList = [{
-						text: "商品总价",
-						imgUrl: "",
-						type: 1,
-					},
-					{
-						text: "运费",
-						imgUrl: "",
-						type: 2,
-					},
-				];
-				//如果是活动
-				if(this.goodsDataList[0].activityPrice&&this.goodsDataList[0].activityPrice>0&&!this.goodsDataList[0].vipPrice>0){
-					this.priceBreakdownList.push({
-						type: 5,
-					})
-				}
-				//如果是vip
-				if(this.goodsDataList[0].isVipPrice==1&&this.goodsDataList[0].vipPrice!=null&&this.goodsDataList[0].vipPrice!=0){
-					this.priceBreakdownList.push({
-						type: 6,
-					})
-				}
-				
-				var data = {
-					uid: this.userInfo.id,
-					productList: this.goodsDataList.map((e) => {
-						return {
-							productId: this.goodsDataList[0].productId,
-							quantity: this.orderNumber,
-						};
-					}),
-				};
-
-				var that = this;
-				this.$http.request({
-					url: `${this.urlList.initPrepareOrder}`,
-					method: "POST",
-					data,
-					header: {
-						"Content-Type": "application/json",
-					},
-				})
-				.then(async (res) => {
-					if (res.code == 0) {
-						this.initData = res.data;
-
-						this.isShowAddress = res.data.is_course ? false : true;
-						if (!this.isShowAddress&&this.$platform=='android') {
-							this.priceBreakdownList.push({
-								text: "积分",
-								imgUrl: require("@/static/icon/jifen.png"),
-								type: 3,
-							});
-						}
-
-						if (this.isShowAddress) {
-							await this.getUserAddress();
-						} else {
-							await this.getTotalPrice();
-						}
-					}
-
-					this.$forceUpdate();
-				});
-			},
-			// 获取地址列表
-			async getUserAddress() {
-				var data = {};
-				var that = this;
-				this.$http.request({
-					url: `${this.urlList.addressList}?userId=${this.userInfo.id}`,
-					method: "POST",
-					data,
-					header: {
-						"Content-Type": "application/json",
-					},
-				})
-
-				.then(async (res) => {
-					if (res.code == 0) {
-						if (res.list.length > 0) {
-							var index = res.list.findIndex((e) => e.isDefault == 1);
-							if (index >= 0) {
-								that.defaultAddressList = {
-									...res.list[index],
-
-									address: `${res.list[index].province}${res.list[index].city}${
-				res.list[index].county
-			  }${
-				res.list[index].detailAddress
-				  ? res.list[index].detailAddress
-				  : ""
-			  }`,
-								};
-							} else {
-								that.defaultAddressList = {
-									...res.list[0],
-									address: `${res.list[0].province}${res.list[0].city}${
-				res.list[0].county
-			  }${
-				res.list[0].detailAddress ? res.list[0].detailAddress : ""
-			  }`,
-								};
-							}
-						} else {
-							this.defaultAddressList = {};
-						}
-					}
-					if (!this.addressData.id) {
-						this.addressData = this.defaultAddressList;
-					}
-					await this.getFreightNum();
-					this.$forceUpdate();
-				});
-			},
-
-			//获取运费
-			async getFreightNum() {
-				if (!this.addressData.regionCode) {
-					await this.getTotalPrice();
-				} else {
-					var data = {
-						products: this.goodsDataList.map((e) => {
-							return {
-								productId: e.productId,
-								quantity: this.orderNumber,
-							};
-						}),
-						regionCode: this.addressData.regionCode,
-					};
-
-					var that = this;
-
-					this.$http
-						.request({
-							url: `${this.urlList.freightNum}`,
-							method: "POST",
-							data,
-							header: {
-								"Content-Type": "application/json",
-							},
-						})
-
-						.then(async (res) => {
-							if (res.code == 0) {
-								this.freightNum = res.result;
-							}
-							await this.getTotalPrice();
-							this.$forceUpdate();
-						});
-
-				}
-			},
-			handleFresh() {
-				this.show = false;
-			},
-			//获取总金额
-			async getTotalPrice() {
-				var s = 0;
-				var that = this;
-				for (var i = this.goodsDataList.length - 1; i >= 0; i--) {
-					s += this.goodsDataList[i].price;
-				}
-				that.totalPrice = s * that.orderNumber;
-				
-				if (!this.isShowAddress) {
-					if (this.initData.user.jf >= that.totalPrice) {
-						this.jfNumber = that.totalPrice - that.vipPrice - that.districtAmount;
-						this.jfNumberMax = that.totalPrice - that.vipPrice - that.districtAmount;
-					} else {
-						this.jfNumber = this.initData.user.jf;
-						this.jfNumberMax = this.initData.user.jf;
-					}
-					if (that.jfNumber == 0 || that.jfNumber == null) {
-						that.jfNumberShow = "0.00";
-						that.actualPayment = that.totalPrice;
-					} else {
-						that.jfNumberShow = that.jfNumber.toFixed(2);
-						that.actualPayment = that.totalPrice - that.jfNumber;
-					}
-					that.actualPayment = that.actualPayment + that.freightNum - that.vipPrice- that.districtAmount;
-				} else {
-					that.actualPayment = that.totalPrice + that.freightNum - that.vipPrice - that.districtAmount;
-				}
-
-				if (this.actualPayment == 0 && !this.isShowAddress) {
-					 this.isDefaultCurrency = true;
-				} else {
-					this.isDefaultCurrency = false;
-				}
-				this.$forceUpdate();
-			},
-			selectAddress(data) {
-				this.show = false;
-			},
-			goToAddress() {
-				uni.navigateTo({
-					url: "/pages/component/commonComponents/address/index?type=order",
-				});
-			},
-			fnCopy(value, title) {
-				this.$commonJS.handleMakingPhoneCalls(value, title);
-			},
-			async checkPermision() {
-				var result = await permission.premissionCheck("CALLPHONE")
-				if (result != 1) {
-					return false
-				}
-				this.gotoPhone()
-			},
-			gotoPhone() {
-				this.$commonJS.handleMakingPhoneCalls("022-24142321");
-			},
-			openOrderModal(v) {
-				this.orderModalShowInfo = v;
-				this.orderModalShow = true;
-				if (this.orderModalShowInfo.type == "remark") {
-					this.content = this.remark;
-				}
-			},
-			async goBuyJie() {
-				debounce(async () => {
-					var that = this;
-					this.nowClick = false;
-					setTimeout(() => {
-						this.nowClick = true;
-					}, 5000);
-					let xiaBiao = [];
-					if (this.options.goods[0].goodsType != "05") {
-						if (!this.addressData.id) {
-							this.$commonJS.showToast("请选择收货地址");
-							return false;
-						}
-					}
-					let data = {
-						buyType: this.options.typeId, //0- 商品页直接下单  1- 购物车结算
-						userId: this.userInfo.id, //下单人ID
-						shippingUser: this.addressData ? this.addressData.consigneeName : "111", //收货人姓名
-						userPhone: this.addressData.consigneePhone, //收货人手机号
-						jfDeduction: this.jfNumber,
-						paymentMethod: this.payType, //支付方式   2支付宝，1微信，3ios内购    4，天医币购买
-						orderMoney: this.totalPrice, //订单金额
-						realMoney: this.actualPayment, //实收金额
-						shippingMoney: this.freightNum, //运费
-						remark: this.remark, //备注
-						couponId: null, //优惠券Id
-						couponName: "", //优惠券名称
-						districtMoney: 0, //活动
-
-						productList: this.goodsDataList.map((e) => {
-							return {
-								productId: e.productId,
-								quantity: this.orderNumber,
-							};
-						}), //订单列表商品
-						orderType: "order", //订单类型
-						addressId: this.options.goods[0].goodsType != "05" ? this.addressData.id : 0, // 地址ID
-						appName: "xlkj",
-						come: "3",  //3心灵空间
-					}
-					if(this.goodsDataList[0].isVipPrice==1&&
-					   this.goodsDataList[0].vipPrice!=null&&
-					   this.goodsDataList[0].vipPrice!=0){
-						  data.vipDiscountAmount = this.vipPrice;  //vip
-					}else if(this.goodsDataList[0].activityPrice&&
-						  this.goodsDataList[0].activityPrice>0){
-						data.districtMoney = this.districtAmount;  //活动
-					}
-
-					await $http.request({
-						url: that.urlList.buyOrder,
-						method: "POST",
-						data,
-						header: {
-							"Content-Type": "application/json",
-						},
-					})
-					.then(async (res) => {
-						if (res.code == 0) {
-							if (res.orderSn == null) {
-								uni.showToast({
-									title: "失败,请重新下单",
-									icon: "none"
-								});
-							} else {
-								if (that.payType == 2) {
-									// 常规支付
-									uni.showToast({
-										title: "正在支付",
-										icon: "loading",
-									});
-									await setPay({
-											typePay: "alipay",
-											subject: "order",
-											totalAmount: res.money,
-											type: 2,
-											relevanceoid: res.orderSn,
-											customerId: that.userInfo.id,
-										},
-										(res) => {
-											uni.showLoading({
-												title: "加载中",
-											});
-											console.log(res, "支付支付");
-											if (res.success) {
-												uni.showToast({
-													title: "支付成功",
-												});
-												setTimeout(() => {
-													if (that.goToInfo.type == 1) {
-														uni.switchTab({
-															url: `${that.goToInfo.url}?type=order`,
-														});
-													} else {
-														uni.redirectTo({
-															url: `${that.goToInfo.url}?backType=order`,
-														});
-													}
-												}, 1000);
-											} else {
-												setTimeout(() => {
-													console.log("延迟调用 失败提示");
-													uni.showToast({
-														title: "支付失败"
-													});
-												}, 0);
-											}
-										}
-									);
-								} else if (this.payType == 1) {
-									// 微信支付
-									let data1 = {
-										orderSn: res.orderSn,
-										buyOrderId: null,
-										totalAmount: res.money,
-									};
-									setWXPay(data1, (res) => {
-										if (res.success) {
-											uni.showToast({
-												title: "支付成功",
-											});
-											setTimeout(() => {
-												if (that.goToInfo.type == 1) {
-													uni.switchTab({
-														url: `${that.goToInfo.url}?type=order`,
-													});
-												} else {
-													uni.redirectTo({
-														url: `${that.goToInfo.url}?backType=order`,
-													});
-												}
-											}, 1000);
-										} else {
-											if (res.data.errMsg.indexOf(
-													"User canceled") != -1) {
-												uni.showToast({
-													title: "用户取消支付",
-													icon: "none"
-												});
-											} else {
-												uni.showToast({
-													title: "支付失败",
-													icon: "none"
-												});
-											}
-										}
-									});
-								} else if (this.payType == 4) {
-									// 天医币支付
-									uni.showToast({
-										title: "购买成功",
-										icon: "success",
-									});
-									setTimeout(() => {
-										if (that.goToInfo.type == 1) {
-											uni.switchTab({
-												url: `${that.goToInfo.url}?type=order`,
-											});
-										} else {
-											uni.redirectTo({
-												url: `${that.goToInfo.url}?backType=order`,
-											});
-										}
-									}, 1000);
-								}
-							}
-						}
-						uni.removeStorageSync('mynavData');
-					});
-				}, 200);
-			},
-
-			radioChange(index) {
-				this.selectPayIndex = index;
-				this.payType = this.payList[this.selectPayIndex].type;
-				this.$forceUpdate();
-			},
-			buttonClick(e) {
-				this.options[2].info++;
-			},
-			// 获取用户详情
-			getUserInfo() {
-				if (this.userInfo.id != undefined) {
-					this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
-						this.userMes = res.user;
-						this.getCateList();
-					});
-				}
-			},
-
-			async handleselectCate(item, index) {
-				this.dataList = [];
-				var data = [];
-				console.log(item, index, 99999);
-				var that = this;
-				this.$http
-					.post(this.urlList.curriculumInfo, {
-						customerType: "D",
-						token: uni.getStorageSync("token"),
-						customerOid: uni.getStorageSync("customerOid"),
-						oid: item.coid,
-					})
-					.then(async (res) => {
-						that.curriculumInfo = res.obj;
-						that.dataList = res.obj.courseList;
-					});
-				this.searchValue = "";
-				this.searchList = [];
-				this.showSearchList = false;
+			this.goodsDataList = res.shopProductList;
 			
-				return data;
-			},
-			async getDetailInfo() {
-				var that = this;
-				this.detailInfo = {
-					content: "<img src='http://oss.taihumed.com/other/null_20210528102528870.jpg' ></img> <img src='http://101.201.146.165:8088/curriculum/detailImg/curriculum_20170420143333621.png'  ></img><p><p>没有中医基础想学中医难不难？中医学者治疗出现瓶颈怎么办？中西医究竟有什么不同呢？吴雄志教授将以全新的视角，完美整合中药学和西医学知识，让你领略当代中医生理学魅力。</p><p><br/><p></p><p><br/></p><p>【思考题】</p><p>1、简述中医的发展这些年出现了哪些变化？</p><p>2、简述中西医学科的异同？</p>",
-				};
-
-				this.searchValue = "";
-				this.searchList = [];
-				this.showSearchList = false;
-			
-				return data;
-			},
-			getCateList(id) {
-				id ? "" : (id = 0);
-				this.twoCateList = [];
-				this.curTwoCateIndex = 0;
-			},
-		},
-		onBackPress() {
-			// #ifdef APP-PLUS
-			plus.key.hideSoftKeybord();
-			// #endif
-		},
-	};
+			console.log('data-data', this.goodsDataList)
+        });
+    },
+  },
+  onBackPress() {
+    // #ifdef APP-PLUS
+    plus.key.hideSoftKeybord();
+    // #endif
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	@import "@/static/mixin.scss";
-	.order_box {
-		padding: 20rpx;
-
-		.order_top {
-			background-color: #fff;
-			margin-bottom: 20rpx;
-		}
-
-		.goods_item {
-			width: 100%;
-			overflow: hidden;
-
-			.textarea {
-				margin-top: 20rpx;
-				background-color: #fffdfd;
-			}
-
-			.goods_item_img {
-				width: 140rpx;
-				height: 140rpx;
-				float: left;
-				background-color: #f5f5f5;
-				border-radius: 10rpx;
-			}
-
-			.normal_box {
-				width: calc(100% - 160rpx);
-				height: auto;
-				float: right;
-
-				.normal_box_top {
-					width: 100%;
-					height: 100rpx;
-				}
-			}
-		}
-	}
-	.flexbox {
-		display: flex;
-	}
-
-	.dataList {
-		height: 100%;
-	}
-
-	.titleList2 {
-		height: calc(100% - 150rpx);
-	}
-
-	.priceDetail {
-		height: calc(100% - 180rpx) !important;
-		padding: 0rpx 0;
-		box-sizing: border-box;
-	}
-
-	.componentPage {
-		height: calc(100% - 90rpx) !important;
-	}
-
-	.dateReminder {
-		width: 100%;
-		font-size: 24rpx;
-		text-align: right;
-		line-height: 40rpx;
-	}
-
-	.fdButtonBox {
-		border: 1rpx solid $themeColor;
-		background-color: $themeColor;
-		color: #fff;
-		// width: 100%;
-		float: right;
-		padding: 4rpx 14rpx;
-		font-size: 24rpx;
-		font-weight: 500;
-		line-height: 30rpx;
-		border-radius: 10rpx;
-		box-sizing: border-box;
-	}
-
-	.commonDetailPage {
-		padding-bottom: 150rpx !important;
-	}
-
-	.goods_box {
-		background-color: #fff;
-		box-sizing: border-box;
-		width: 100%;
-
-		.title {
-			color: #333;
-			font-weight: 600;
-			margin-bottom: 20rpx;
-		}
-
-		.curriulum_title_box {
-			width: calc(100%) !important;
-			padding-bottom: 20rpx;
-			background-color: #fff;
-
-			.curriulum_title {
-				width: calc(100% - 80rpx);
-				font-weight: 500;
-				font-size: 30rpx;
-				margin-top: 10rpx;
-				margin-bottom: 0rpx;
-				color: #333;
-				box-sizing: border-box;
-			}
-		}
-	}
-
-	.dataList {
-		background-color: #fff !important;
-		padding: 0 30rpx 40rpx !important;
-		box-sizing: border-box;
-	}
-	/deep/.scroll-view-item:nth-child(2n-1) {
-		background-color: transparent !important;
-	}
-
-	.dataList {
-		height: auto !important;
-	}
-
-	.related_courses_box {
-		background-color: #fff;
-
-		.small_class_teaching_content {
-			padding: 10rpx 20rpx;
-			box-sizing: border-box;
-		}
-	}
-
-	.related_courses_name {
-		display: inline-block;
-		width: calc(100% - 150rpx) !important;
-
-		.aui-text-danger {
-			display: inline-block;
-			float: right;
-		}
-	}
-
-	.original_price {
-		font-size: 28rpx !important;
-		font-weight: 500;
-		color: #999 !important;
-		white-space: nowrap;
-		text-decoration: line-through;
-		float: left;
-		margin-top: 6rpx;
-	}
-
-	.price {
-		width: auto;
-		font-size: 28rpx;
-		font-weight: 600;
-		margin-right: 10rpx;
-		color: #333;
-	}
-
-	.normal_box_top .price_box {
-		width: auto;
-		overflow: hidden;
-		margin-top: 20rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		
-		
-		.vip_price_jg{
-			color: red;
-			font-weight: bold;
-		}
-		.vip_price_text{
-			color: red;
-			padding-left: 10rpx;
-			font-size: 24rpx;
-			font-weight: normal;
-		}
-		.vip_price_line{
-			color: #666;
-			text-decoration: line-through;
-			padding-left: 15rpx;
-		}
-	}
-
-	.commonTags {
-		margin-right: 20rpx;
-		margin-top: -5rpx !important;
-	}
-
-	.sales_number {
-		text-decoration: none;
-		color: #b0b0b0;
-		font-weight: 500;
-	}
-	/deep/.common_curriculum_list {
-		margin-top: 20rpx;
-		padding: 20rpx 20rpx 20rpx;
-
-		.content_item {
-			width: 100% !important;
-			margin-bottom: 0 !important;
-			padding: 15rpx 0 0rpx;
-			border-top: 1rpx solid #f1f0f0;
-			// height: 160rpx;
-
-			.book_image {
-				width: 60rpx !important;
-				height: 60rpx !important;
-				float: left !important;
-				background-color: #f5f5f5;
-			}
-
-			.common_curriculum_item {
-				width: calc(100% - 88rpx);
-				float: right;
-				display: block !important;
-
-				// overflow: hidden;
-
-				.related_courses_name {
-					width: 100% !important;
-				}
-			}
-		}
-
-		.content_item:nth-child(1) {
-			border-top: none !important;
-		}
-	}
-
-	/deep/.common_section {
-		padding: 0 !important;
-		padding-bottom: 20rpx !important;
-	}
-
-	.goods_detail_list_title {
-		display: block;
-		padding-top: 20rpx;
-		padding-bottom: 40rpx;
-
-		.linlanzhifu {
-			display: flex;
-			align-items: center;
-		}
-
-		.other_info {
-			font-size: 28rpx;
-			// color: #aaa;
-			color: #5a5a5a;
-
-			.explain {}
-		}
-
-		.left {
-			display: flex;
-			align-items: center;
-		}
-
-		.right {
-			font-size: 24rpx;
-			font-weight: 500 !important;
-			color: #999;
-			font-family: none;
-		}
-	}
-
-	.commonPageContentBox {
-		height: auto !important;
-	}
-
-	.minus {
-		width: 50rpx;
-		height: 50rpx;
-		border-width: 2rpx;
-		border-color: #e6e6e6;
-		border-right-color: transparent;
-
-		border-top-left-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-		border-style: solid;
-		@include flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.input {
-		padding: 0 10px;
-		height: 50rpx;
-		border: 1rpx solid #e6e6e6;
-	}
-
-	.plus {
-		width: 50rpx;
-		height: 50rpx;
-		border-width: 2rpx;
-		border-color: #e6e6e6;
-		border-left-color: transparent;
-		border-style: solid;
-		// background-color: #3AB3AE;
-
-		border-top-right-radius: 10rpx;
-		border-bottom-right-radius: 10rpx;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-		color: $themeColor;
-	}
-
-	.order_bottom_box {
-		position: absolute;
-		right: 20rpx;
-
-		.number {
-			font-size: 26rpx;
-			margin-right: 15rpx;
-		}
-
-		.price {
-			font-size: 30rpx;
-			.total {
-				font-size: 30rpx;
-				color: red;
-			}
-		}
-	}
-
-	/deep/.goods_nav_box {
-		.left {
-			margin-top: -10rpx;
-			width: calc(100% - 220rpx);
-			height: auto;
-			position: relative;
-		}
-	}
-
-	.explain {
-		word-wrap: break-word;
-		word-break: normal;
-		word-break: break-all; //会断词
-		// white-space: nowrap;
-	}
-
-	.order_bottom_box {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.pay_box {
-		.pay_item {
-			border-bottom: 1rpx solid #eeecec;
-			padding-top: 20rpx;
-			justify-content: space-between;
-
-			.top {
-				width: 100%;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-			}
-
-			.left {
-				line-height: 50rpx;
-				font-family: MicrosoftYaHei;
-				font-weight: 500;
-
-				color: #242323;
-
-				.pay_item_img {
-					width: 50rpx;
-					height: 50rpx;
-					float: left;
-					margin-right: 20rpx;
-				}
-				.pay_item_img_icon{
-					width: 40rpx;
-					height: 40rpx;
-					float: left;
-					margin-right: 8rpx;
-				}
-			}
-
-			.bottom {
-				width: calc(100% - 60rpx);
-				float: right;
-				// background-color: #dcdfe6;
-				background-color: #f5f5f5;
-				border-radius: 20rpx;
-				margin-top: 20rpx;
-
-				.jf_box {
-					width: 100%;
-					display: flex;
-					align-items: center;
-					padding: 0 20rpx;
-					box-sizing: border-box;
-					justify-content: space-between;
-					color: #aaa;
-				}
-
-				.jf_input {
-					width: calc(100% - 320rpx) !important;
-					padding: 10rpx 0;
-					box-sizing: border-box;
-				}
-			}
-		}
-
-		/deep/.pay_item:nth-last-child(1) {
-			border-bottom: none !important;
-		}
-	}
-
-	.linlanzhifu {
-		font-size: 28rpx;
-		line-height: 24rpx;
-	}
-
-	.address_box {
-		display: flex;
-		align-items: center;
-		padding: 30rpx 20rpx;
-
-		.order_top {
-			background-color: #fff;
-		}
-
-		.user_info {
-			width: 100%;
-			float: left;
-			display: flex;
-			align-items: center;
-
-			.name {
-				color: #838282;
-				margin-right: 10rpx;
-			}
-
-			.tel {
-				color: #838282;
-			}
-		}
-
-		.curriulum_title {
-			width: auto;
-			font-size: 30rpx;
-			font-weight: 700;
-			float: left;
-			margin-right: 10rpx;
-			color: #333;
-			line-height: 40rpx;
-			letter-spacing: 2rpx;
-		}
-
-		.normal_box {
-			margin-left: 5rpx;
-			width: calc(100% - 120rpx);
-		}
-
-		.goods_box {
-			padding: 20rpx 20rpx;
-			display: flex;
-			align-items: center;
-		}
-
-		.rightArrow {
-			margin-left: 40rpx;
-			width: 40rpx;
-			height: 40rpx;
-			// position: absolute;
-			// right: 30rpx;
-		}
-	}
-
-	.rightArrow {
-		width: 40rpx;
-		height: 40rpx;
-		// position: absolute;
-		// right: 30rpx;
-	}
-
-	.orderModalShow {
-		width: 100%;
-		max-height: 48vh;
-		padding-bottom: 120rpx;
-	}
-
-	.popup_box {
-		.curriulum_title_box {
-			.title {
-				text-align: center;
-				font-size: 34rpx !important;
-				padding-top: 15rpx !important;
-				margin-bottom: 30rpx !important;
-			}
-		}
-	}
-
-	.hasRemark {
-		color: #333 !important;
-	}
-	
-	.goods_item_vip{
-		position: absolute;
-		left: 0px;
-		top: 0;
-		z-index: 99;
-		background: #ff1f00;
-		padding: 0 4px;
-		border-radius: 4px;
-		line-height: 18px;
-		font-size: 9px;
-		color: #fff;
-	}
-	.type_text_red{
-		color: red;
-	}
-</style>
\ No newline at end of file
+.commonPage, .commonPageBox {
+    height: calc(100vh - 50px);
+}
+.goodsvipLabel {
+  position: absolute;
+  z-index: 10;
+  top: 4px;
+  left: 0px;
+  margin-right: 10px;
+  text-align: center;
+  font-size: 18rpx;
+  background-color: #f94f04;
+  color: #fff;
+  font-weight: bold;
+  border-radius: 4px;
+  width: 80rpx;
+  padding: 2px 4px;
+  box-sizing: border-box;
+}
+.goods_item_img {
+  width: 140rpx;
+  height: 140rpx;
+  float: left;
+  background-color: #f5f5f5;
+  border-radius: 10rpx;
+}
+</style>
diff --git a/pages/goods/shopping.vue b/pages/goods/shopping.vue
new file mode 100644
index 0000000..2dc90e2
--- /dev/null
+++ b/pages/goods/shopping.vue
@@ -0,0 +1,384 @@
+<template>
+	<view>
+		<z-nav-bar title="购物车"></z-nav-bar>
+		<view class="shopCarContent">
+			<scroll-view scroll-y="true" v-if="cartList.length>0">
+				<view class="cartItem" v-for="(item,index) in cartList" :key="index">
+					<view class="select">
+						<checkbox style="transform:scale(0.8)" :checked="item.checked" @click="checkboxGroupChange(index,item)" class="round checkedItem" />
+					</view>
+					<view class="cartContent" style="position: relative;">
+						<span v-if="item.isVipPrice==1&&item.vipPrice!=0&&item.vipPrice!=null"
+									style="position: absolute;z-index: 10;top: 4px;left: 0px; text-align: center;font-size: 18rpx;background-color: #f94f04;color: #fff; border-radius:4px; padding:2px 4px;line-height: 14px;">VIP优惠</span>
+								
+						<image :src="item.image" mode="" @click="goDetail(item.productId)"></image>
+						<view class="itemCenter">
+							<view class="cartTitle" @click="goDetail(item.productId)" style="display: flex;align-items: center;">
+								<text>{{item.productName}}</text>
+							</view>
+							<view class="itemPrice">
+								<text v-if="item.isVipPrice==1&&item.vipPrice!=0&&item.vipPrice!=null">
+									<text style="color: #e97512;font-size: 16px;font-weight: bold;">￥{{(item.vipPrice).toFixed(2)}}</text>
+									<text style="color: #8a8a8a;font-size: 14px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(item.price).toFixed(2)}}</text>
+								</text>
+
+							<text
+								v-else-if="item.activityPrice && item.activityPrice > 0">
+								<text style="color: #e97512;font-size: 16px;font-weight: bold;">￥{{(item.activityPrice).toFixed(2)}}</text>
+									<text style="color: #8a8a8a;font-size: 14px;margin-left: 4px;font-weight: bold;text-decoration: line-through;">￥{{(item.price).toFixed(2)}}</text>
+							</text>
+
+							<text v-else style="color: #e97512;font-size: 16px;font-weight: bold;">￥{{item.price}}</text>
+								<u-number-box button-size="20" v-model="item.productAmount" @change="valChange($event,item)"
+									:input-width="25" :input-height="10" :min="1" :max="item.productStock" integer
+									@overlimit='overlimit'></u-number-box>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+			<view v-else style=" font-size: 28rpx; text-align: center; padding-top: 100rpx; color: #999;">暂无数据</view>
+		</view>
+
+		<!-- 底部操作区 -->
+		<view class="shopCarFooter">
+			<view class="selectAll">
+				<checkbox :checked="all" style="transform:scale(0.8)" @click="isSelectAll()" class="round checkedItem" />
+				<text class="cartCho">全选</text>
+				<button class="mini-btn"
+					style="border-radius: 10rpx; font-size: 26rpx; line-height: 30rpx; padding: 10rpx 25rpx; margin-left: 20rpx;"
+					v-if="isCartDelShow" @click="delCart()" type="warn" size="mini">删除</button>
+			</view>
+			<view class="exhibition">
+				<view class="total">合计: <b>￥{{totalPrice}}</b>
+			</view>
+				<view class="settlement" @click="setTment()">
+					结算
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import $http from '@/config/requestConfig.js';
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				playData: {},
+				totalPrice: 0, // 总价
+				all: false, // 是否全选
+				isCartDelShow: false, // 是否展示删除按钮
+				cartList: [] // 购物车列表
+			};
+		},
+		//第一次加载
+		onLoad(e) {
+			this.getCartList()
+		},
+		//页面显示
+		onShow() {
+			this.getCartList();
+			this.all = false;
+			this.isCartDelShow = false
+			this.totalPrice = 0
+		},
+		computed: {
+			...mapState(['userInfo']),
+		},
+		//方法
+		methods: {
+			// 获取购物车列表
+			getCartList() {
+				this.$http.post(`book/ordercart/getCartList?userId=${this.userInfo.id}`).then(res => {
+					this.cartList = res.cartList
+					if (res.cartList.length > 0) {
+						res.cartList.forEach((item, index) => {
+							item.checked = false
+						})
+						this.cartList = res.cartList
+					}
+				})
+			},
+			// 是否全选
+			isSelectAll(e) {
+				if (this.cartList.length > 0) {
+					this.all = !this.all
+					this.cartList.forEach((item, index) => {
+						item.checked = this.all
+					})
+					this.isCartDelShow = this.all
+					this.total()
+				} else {
+					this.all = false
+				}
+			},
+			// 选中单独商品
+			checkboxGroupChange(index, item) {
+				// 修改当前item的checked
+				this.cartList[index].checked = !item.checked
+				// 判断是否全选
+				this.all = this.cartList.every((item, index) => {
+					return item.checked == true
+				})
+				// 判断是否展示删除按钮
+				this.isCartDelShow = this.cartList.some((item, index) => {
+					return item.checked == true
+				})
+				// 计算总价
+				this.total()
+			},
+			// 计算总价
+			total() {
+				let allprice = 0;
+				this.cartList.forEach((item, index) => {
+					let price = 0;
+					if (item.checked) {
+						if (item.isVipPrice == 1 && item.vipPrice != 0) {
+						price = (item.productAmount * item.vipPrice).toFixed(2);
+					} else {
+						if (item.activityPrice && item.activityPrice > 0) {
+							price = (item.productAmount * item.activityPrice).toFixed(2);
+						} else {
+							price = (item.productAmount * item.price).toFixed(2);
+						}
+					}
+					}
+					allprice += Number(price)
+				})
+				this.totalPrice = allprice.toFixed(2)
+			},
+			// 超出阈值时
+			overlimit() {
+				uni.showToast({
+					title: '超出商品数量',
+					icon: 'error',
+					duration: 1000
+				})
+			},
+			valChange(e, item) {
+				console.log(e)
+				let productItem = {}
+				productItem = item
+				productItem.productAmount = e.value
+				this.updateCart(productItem)
+				setTimeout(() => {
+					this.total()
+				}, 300)
+			},
+			// 更新购物车
+			updateCart(shagnpin) {
+				// 已在购物车中添加
+				$http.request({
+					url: "book/ordercart/update",
+					method: "POST",
+					data: shagnpin,
+					header: {
+						'Content-Type': 'application/json'
+					}
+				}).then(res => {
+					if (res.code == 0) {
+						
+					}
+				})
+			},
+			// 删除购物车
+			delCart() {
+				let cartIdArr = [];
+				this.cartList.forEach((item, index) => {
+					if (item.checked) {
+						cartIdArr.push(item.cartId)
+					}
+				})
+				uni.showModal({
+					title: '提示',
+					content: '是否删除这个商品',
+					confirmText: '确定',
+					success: (res) => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中',
+								mask: true
+							})
+							console.log(cartIdArr)
+							$http.request({
+								url: "book/ordercart/delete",
+								method: "POST",
+								data: cartIdArr,
+								header: {
+									'Content-Type': 'application/json'
+								},
+							}).then(res => {
+								this.isCartDelShow = false
+								this.totalPrice = 0
+								this.getCartList()
+								uni.hideLoading();
+								this.all = false;
+							})
+						} else {
+							console.log('cancel') //点击取消之后执行的代码
+						}
+					}
+				})
+			},
+
+			// 跳转结算页面
+			setTment() {
+				let goods = []
+				this.cartList.forEach((item, index) => {
+					if (item.checked) {
+						goods.push({
+							productImages: item.productImages,
+							productId: item.productId,
+							productName: item.productName,
+							goodsType: item.goodsType,
+							productAmount: item.productAmount,
+						})
+					}
+				})
+				
+				let mynavData = JSON.stringify({
+					goods: goods,
+					typeId: 1
+				})
+				// 如果没有勾选
+				if (goods.length == 0) {
+					uni.showToast({
+						title: "请先勾选商品",
+						icon: 'error',
+						duration: 1000,
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/goods/order?data='+ mynavData
+					});
+				}
+			},
+			//商品内容跳转
+			goDetail(id) {
+				uni.navigateTo({
+					url: '/pages/goods/index?isMiaosha=1&id='+id
+				});
+			},
+		},
+
+	};
+</script>
+<style lang="scss" scoped>
+	@import '@/static/mixin.scss';
+
+	.shopCarContent {
+		width: 100%;
+		height: 100%;
+		padding-bottom: 104rpx;
+		padding-top: 20rpx;
+
+		.cartItem {
+			padding: 10rpx 10rpx 10rpx 10rpx;
+			margin-bottom: 20rpx;
+			display: flex;
+			align-items: center;
+			background-color: #fff;
+
+			.cartContent {
+
+				flex: 1;
+				display: flex;
+
+				image {
+					width: 130rpx;
+					height: 150rpx;
+					border-radius: 10rpx;
+					padding: 10rpx;
+					margin-right: 15rpx;
+				}
+
+				.itemCenter {
+					flex: 1;
+					flex-direction: column;
+					justify-content: space-around;
+				}
+
+				.cartTitle {
+					font-size: 30rpx;
+					margin: 35rpx 0 20rpx 0;
+				}
+
+				.itemPrice {
+					font-size: 28rpx;
+					display: flex;
+					justify-content: space-between;
+				}
+			}
+		}
+	}
+
+	.shopCarFooter {
+		width: 100%;
+		height: 100rpx;
+		padding: 20rpx;
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		position: fixed;
+		bottom: 0;
+
+		.selectAll {
+
+			display: flex;
+
+
+			.cartCho {
+				font-size: 26rpx;
+				color: #888;
+			}
+
+			.cartDel {
+				font-weight: bold;
+				color: #bf0c0c;
+				font-size: 14px;
+				margin: 12rpx 0 0 20rpx;
+			}
+		}
+
+		.exhibition {
+			display: flex;
+			align-items: center;
+
+			.total {
+				font-size: 15px;
+				padding: 0 40rpx 0 0;
+				color: #888;
+
+				b {
+					margin-left: 10rpx;
+					color: #ef1224;
+					font-size: 35rpx;
+				}
+			}
+
+			.settlement {
+				font-size: 28rpx;
+				font-weight: 700;
+				padding: 10rpx 50rpx;
+				background-image: linear-gradient(90deg, rgb(254, 96, 53), rgb(239, 18, 36));
+				color: #fff;
+				border-radius: 40rpx;
+			}
+		}
+	}
+	/deep/.uni-checkbox-input{
+		border-radius: 50rpx;
+	}
+	.shopCarFooter .selectAll{
+		display: flex;
+		align-items: center;
+	}
+	/deep/uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked{
+		color: $themeColor !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 6ad4800..ac94205 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -175,6 +175,16 @@ export default {
 				  url: "/pages/order/index",
 				  type: "switchTab",
 				},
+				{
+				  name: "我的购物车",
+				  url: "/pages/goods/shopping",
+				  type: "pageJump",
+				},
+				{
+					name: "培训班管理",
+					url: "/pages/trainingCourse/index",
+					type: "pageJump",
+				},
 				{
 					name: "个人资料",
 					url: "/pages/my/persData",
diff --git a/pages/my/persData.vue b/pages/my/persData.vue
index bf2db6c..493c585 100644
--- a/pages/my/persData.vue
+++ b/pages/my/persData.vue
@@ -290,7 +290,7 @@
 		methods: {
 
 			async checkPermision() {
-				var result = await permission.premissionCheck("CAMERA_EXTERNAL_STORAGE")
+				var result = await permission.premissionCheck("CAMERA")
 				if (result != 1) {
 					return false
 				}
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 3befc09..94a4362 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -45,6 +45,54 @@
 									</view>
 								</view>
 
+								<view v-if="slotProps.row.orderType == 'trainingClass'" class="bookinfolist">
+									<image
+									  class="feng fengPoint"
+									  src="/static/icon/icon_pxb.png"
+									  mode="aspectFill"
+									>
+									</image>
+									<view class="btns flexbox">
+										<view class="booknameleft">{{ slotProps.row.remark }}</view>
+								
+										<view style="
+											line-height: 58rpx;
+											color: #333;
+											font-size: 26rpx;
+											font-weight: 700;
+											">
+											<text style="font-size: 20rpx"></text>
+										</view>
+									</view>
+									<view class="btns flexbox"
+										style="color: #9f9f9f; font-size: 24rpx">
+										下单时间：{{ slotProps.row.createTime }}
+									</view>
+								</view>
+								<view v-if="slotProps.row.orderType == 'relearn'" class="bookinfolist" style=" display: flex; align-items: center;">
+								  <image
+								    class="feng fengPoint"
+								    src="/static/icon/fugou.png"
+								    mode="aspectFill"
+								  >
+								  </image>
+								  <view class="btns flexbox">
+								    <view class="booknameleft">
+								      {{ slotProps.row.remark }}
+								    </view>
+								
+								    <view
+								      style="
+								        line-height: 58rpx;
+								        color: #333;
+								        font-size: 26rpx;
+								        font-weight: 700;
+								      "
+								    >
+								      <text style="font-size: 20rpx"></text>
+								    </view>
+								  </view>
+								</view>
 								<view v-if="slotProps.row.orderType == 'vip'" class="bookinfolist">
 									<image class="feng fengPoint" src="../../static/icon/vip.png" mode="aspectFill"></image>
 									<view class="btns flexbox">
@@ -63,7 +111,7 @@
 										</view>
 									</view>
 									<view class="btns flexbox"
-										style="color: #9f9f9f; margin-top: 10rpx; font-size: 24rpx">
+										style="color: #9f9f9f; font-size: 24rpx">
 										下单时间：{{ slotProps.row.createTime }}
 									</view>
 								</view>
@@ -84,7 +132,7 @@
 										</view>
 									</view>
 									<view class="btns flexbox"
-										style="color: #9f9f9f; margin-top: 10rpx; font-size: 24rpx">
+										style="color: #9f9f9f; font-size: 24rpx">
 										下单时间：{{ slotProps.row.createTime }}
 									</view>
 								</view>
@@ -198,16 +246,15 @@
 								    </view>
 								  </view>
 								</view>
-
+								
 								<view class="operation_box boxShadow" v-if="slotProps.row.isShowMore == true">
 									<view v-if="slotProps.row.orderStatus == 0"
 										@click.stop="canceOrder(slotProps.row)">取消订单</view>
 								</view>
+								
 								<view class="btns flexbox" style="margin-top: 10rpx">
-									<view class="left" style="color: #c0c4cc" 
-									 v-if="slotProps.row.orderStatus != 3"
+									<view class="left" style="color: #c0c4cc"
 									 @click.stop="openMore(slotProps.row, slotProps.rowIndex)">更多</view>
-									 <view class="left" v-if="slotProps.row.orderStatus == 3"></view>
 									<view class="right flexbox opbtns">
 										<view class="orderstatusbtn orderstatusbtn_success"
 											v-if="slotProps.row.orderStatus == 0"
@@ -220,7 +267,6 @@
 										<view class="orderstatusbtn" v-if="slotProps.row.orderStatus == 3">申请售后</view>
 									</view>
 								</view>
-
 								<view style="border-bottom: 2rpx solid #e9e9e9; height: 50rpx"
 									v-if="slotProps.rowIndex < slotProps.row.length - 1"></view>
 							</view>
diff --git a/pages/place/order.vue b/pages/place/order.vue
index b4dc0b8..adfb895 100644
--- a/pages/place/order.vue
+++ b/pages/place/order.vue
@@ -304,7 +304,7 @@ export default {
 		}
 		
 		//如果是延期的
-		if(this.yanqiStatus){
+		if(this.yanqiStatus||this.orderType=='pxb'){
 			this.priceBreakdownList.push({
 				type: 2,
 				imgUrl: require("@/static/icon/jifen.png"),
@@ -327,7 +327,7 @@ export default {
 		  if (this.userInfo.id != undefined) {
 			await this.$http.post("book/user/info/" + this.userInfo.id).then(async(res) => {
 				this.user = res.user;
-				if(this.yanqiStatus){
+				if(this.yanqiStatus||this.orderType=='pxb'){
 					await this.getTotalPrice(res.user);
 				}
 				
@@ -447,25 +447,32 @@ export default {
 		//培训班的购买
 		async submitPxb() {
 			debounce(async () => {
-				uni.showLoading({
-					title: '加载中'
-				});	
 				if(!this.name){
 					uni.showToast({
 						title: "培训姓名不能为空",
 						icon: 'none'
 					});
-					uni.hideLoading()
-					return
+					return false;
 				}
-					
+				if(this.buyStatus){
+					uni.showToast({
+						title: "请勿重复下单",
+						icon: "none",
+					});
+					return false;
+				}
+				uni.showLoading({
+					title: '加载中'
+				});	
+				//下单状态
+				this.buyStatus = true;
 				var that = this;
 				let data = {
 					paymentMethod: that.payType,
 					orderMoney: that.options.price,
 					jfDeduction: that.jfNumber,
 					realMoney: that.actualPayment,
-					come: '2',
+					come: '3',
 					remark: that.options.title,
 					trainingClassId: that.options.id,
 					trainingClassIdentity: that.options.identity +'：'+that.options.price,
@@ -488,6 +495,7 @@ export default {
 								title: "失败,请重新下单",
 								icon: "none"
 							});
+							that.buyStatus = false;
 						} else {
 							if (that.payType == 2) {
 								// 常规支付
@@ -519,6 +527,7 @@ export default {
 											}, 1000);
 										} else {
 											setTimeout(() => {
+												that.buyStatus = false;
 												console.log("延迟调用 失败提示");
 												uni.showToast({
 													title: "支付失败"
@@ -545,8 +554,7 @@ export default {
 											})
 										}, 1000);
 									} else {
-										if (res.data.errMsg.indexOf(
-												"User canceled") != -1) {
+										if (res.data.errMsg.indexOf("User canceled") != -1) {
 											uni.showToast({
 												title: "用户取消支付",
 												icon: "none"
@@ -557,6 +565,7 @@ export default {
 												icon: "none"
 											});
 										}
+										that.buyStatus = false;
 									}
 								});
 							} else if (that.payType == 4) {
@@ -573,12 +582,12 @@ export default {
 							}
 						}
 					}
-					uni.removeStorageSync('mynavData');
 				})
 				.catch(()=>{
-					uni.hideLoading()
+					uni.hideLoading();
+					that.buyStatus = false;
 				});
-			}, 400);
+			}, 1000);
 		},
 		
 		//vip的购买
@@ -733,7 +742,7 @@ export default {
 		
 			this.xieyi = data;
 			this.xieyiShow = true;
-		},
+		}
 	},
 };
 </script>
diff --git a/pages/trainingCourse/detail.vue b/pages/trainingCourse/detail.vue
new file mode 100644
index 0000000..e4ae6bc
--- /dev/null
+++ b/pages/trainingCourse/detail.vue
@@ -0,0 +1,69 @@
+<template>
+	<view class="page" style=" height:100vh; background: #f6f6f8;">
+		<z-nav-bar title="培训班管理"></z-nav-bar>
+		<view v-if="image&&image.length>0">
+			<image v-for="(item,index) in image" :key="index" :src="item" mode="aspectFit" class="image"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+import $http from '@/config/requestConfig.js';
+
+export default {
+	data() {
+		return {
+			image: [],
+		}
+	},
+	onLoad(e) {
+		this.image = e.image.split(',');
+		console.log(this.image)
+	},
+	onShow() {
+		
+	},
+	methods: {
+		//获取数据
+		getData(){
+			uni.showLoading({
+				title: '加载中'
+			})
+			$http.request({
+				url: "common/trainingClass/trainingClassList",
+				method: "POST",
+				data: {
+					year: this.year
+				},
+				header: {
+					'Content-Type': 'application/json'
+				},
+			})
+			.then(res => {
+				uni.hideLoading();
+				if (res.code == 0) {
+					if(res.trainingClassList&&res.trainingClassList.length>0){
+						this.list = res.trainingClassList;
+					}else{
+						this.list = [];
+						this.nullStatus = true;
+					}
+				}
+			}).catch(e => {
+				
+			});
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.image{
+	width: 100%;
+	height: auto;
+}
+/deep/.image img{
+	position: initial;
+	opacity: 1;
+}
+</style>
\ No newline at end of file
diff --git a/pages/trainingCourse/index.vue b/pages/trainingCourse/index.vue
new file mode 100644
index 0000000..16648e0
--- /dev/null
+++ b/pages/trainingCourse/index.vue
@@ -0,0 +1,238 @@
+<template>
+	<view class="page" style=" height:100vh; background: #f6f6f8;">
+		<z-nav-bar title="培训班管理" :backToMyPage="true">
+			<view slot="right">
+				<picker mode="date" fields="year" @change="handleYearChange">
+				  <view class="picker">
+					<uni-icons type="info" size="16"></uni-icons>{{ year || '请选择年份' }}
+				  </view>
+				</picker>
+			</view>
+		</z-nav-bar>
+		<view class="list_block" v-if="!nullStatus">
+			<view class="list_item" v-for="(item,index) in list" :key="index">
+				<view class="list_item_right">
+					<text class="list_item_title">{{item.title}}</text>
+					<text class="list_item_text">活动类型：<span v-if="item.type==1">线上</span><span v-else>线下</span></text>
+					<text class="list_item_text">活动年份：{{item.year}}</text>
+					<text class="list_item_text">培训日期：{{item.trainingDate}}至{{item.endDate}}</text>
+					<text class="list_item_text">培训价格：
+						<span style="color: red; font-size: 32rpx; font-weight: bold;">￥{{item.finalFee}}</span>
+						<span style="text-decoration: line-through; padding-left: 15rpx;" v-if="Number(item.finalFee)!=item.fee">￥{{item.fee}}</span>
+					</text>
+					<text class="list_item_text" style=" font-size: 24rpx;" v-if="Number(item.finalFee)!=item.fee">{{item.identity}}身份报名享优惠折扣</text>
+					<view style=" display: flex; align-items: center;">
+						<uni-button class="list_item_btn" @click="goToDetail(item)">了解详情</uni-button>
+						<uni-button class="list_item_btn list_item_btn_bm" @click="goToBuy(item)" v-if="item.isJoin!=1&&item.singupFlag!=0">立即报名</uni-button>
+						<uni-button class="list_item_btn list_item_btn_ybm" @click="goToContact(item)" v-if="item.isJoin==1&&item.singupFlag!=0">已报名联系客服</uni-button>
+					</view>
+				</view>
+				
+				<view class="statusBg" v-if="item.isJoin==1">已报名</view>
+				<view class="statusBg statusBg2" :class="item.isJoin==1?'statusBg_top':''" v-if="item.singupFlag==0">已关闭</view>
+			</view>
+		</view>
+		<view class="zanwu" v-if="nullStatus">暂无数据</view>
+		<u-popup key="1" v-if="showCodeImg" :show="showCodeImg" :round="10" @close="closePup">
+			<view class="box6">
+				<text>非常感谢您报名我们的培训班，<br/>您可以添加客服微信，我们会邀请您进培训群。</text>
+				<image @click="previewImage('/static/qiyeWx.jpg')" src="/static/qiyeWx.jpg" mode="widthFix" style="width: 100px; height: 100px; margin: 0 auto;"></image>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+import $http from '@/config/requestConfig.js';
+
+export default {
+	data() {
+		return {
+			list: [],
+			nullStatus: false,
+			year: '',
+			showCodeImg: false,
+		}
+	},
+	onLoad(e) {
+		
+	},
+	onShow() {
+		this.getData();
+	},
+	methods: {
+		//获取数据
+		getData(){
+			uni.showLoading({
+				title: '加载中'
+			})
+			$http.request({
+				url: "common/trainingClass/trainingClassList",
+				method: "POST",
+				data: {
+					year: this.year
+				},
+				header: {
+					'Content-Type': 'application/json'
+				},
+			})
+			.then(res => {
+				uni.hideLoading();
+				if (res.code == 0) {
+					if(res.trainingClassList&&res.trainingClassList.length>0){
+						this.list = res.trainingClassList;
+					}else{
+						this.list = [];
+						this.nullStatus = true;
+					}
+				}
+			}).catch(e => {
+				
+			});
+		},
+		//选择年份
+		handleYearChange(event){
+			this.year = event.detail.value;
+			this.list = [];
+			this.nullStatus = false;
+			this.getData();
+		},
+		//了解详情
+		goToDetail(item){
+			uni.navigateTo({
+			  url: `/pages/trainingCourse/detail?image=${item.icon}`,
+			});
+		},
+		//立即报名
+		goToBuy(item){
+			var data = {
+				id: item.id,
+				title: item.title,
+				price: item.finalFee,
+				identity: item.identity,
+				orderType: 'pxb',
+			}
+			uni.navigateTo({
+			  url: '/pages/place/order?data='+JSON.stringify(data)
+			});
+		},
+		//联系客服
+		goToContact(item){
+			this.showCodeImg = true;
+		},
+		//关闭弹窗
+		closePup(){
+			this.showCodeImg = false;
+		},
+		//放大图片
+		previewImage(url) {
+			this.showCodeImg = false
+			uni.previewImage({
+				urls: [url],
+			});
+		},
+	},
+	onBackPress(){
+		uni.reLaunch({
+			url:'/pages/my/index'
+		})
+		return true; //阻止默认返回行为
+	},
+}
+</script>
+
+<style>
+.zanwu{
+	font-style: 26rpx;
+	line-height: 30rpx;
+	padding-top: 100rpx;
+	text-align: center;
+	color: #999;
+}
+.list_block{
+	padding: 20rpx;
+}
+.list_item{
+	margin-bottom: 20rpx;
+	background-color: #fff;
+	border-radius: 15rpx;
+	padding: 20rpx;
+	box-shadow: 0px 0px 6px 0px #a7bbe4;
+	position: relative;
+}
+.list_item_right{
+	margin-left: 20rpx;
+}
+.list_item_right text{
+	display: block;
+}
+.list_item_title{
+	font-size: 32rpx;
+	font-weight: bold;
+	color: #333;
+	line-height: 40rpx;
+	padding-bottom: 10rpx;
+}
+.list_item_text{
+	font-size: 28rpx;
+	color: #666;
+	line-height: 42rpx;
+}
+.list_item_btn{
+	margin-top: 15rpx;
+	width: 150rpx;
+	height: 50rpx;
+	text-align: center;
+	line-height: 50rpx;
+	border-radius: 15rpx;
+	background-image: linear-gradient(90deg, #258feb 0%, #00e1ec 100%);
+	font-size: 24rpx;
+	color: #fff;
+}
+.list_item_btn_bm{
+	margin-left: 10rpx;
+	background-image: linear-gradient(90deg, #ff1f00 0%, #fa9f93 100%);
+}
+.list_item_btn_ybm{
+	width: 200rpx;
+	margin-left: 10rpx;
+	background-image: linear-gradient(90deg, #ff8d00 0%, #f5c350 100%);
+}
+.statusBg{
+	position: absolute;
+	right: 0;
+	top: 20rpx;
+	width: 100rpx;
+	height: 44rpx;
+	line-height: 44rpx;
+	background: #ff1f00;
+	opacity: 0.8;
+	border-radius: 50rpx 0 0 50rpx;
+	font-size: 22rpx;
+	color: #fff;
+	padding-left: 20rpx;
+}
+.statusBg2{
+	background: #999;
+}
+.statusBg_top{
+	top: 70rpx;
+}
+.picker{
+	display: flex;
+	align-items: center;
+	font-size: 26rpx;
+	padding-right: 20rpx;
+}
+.box6{
+	padding: 20rpx;
+}
+.box6 text{
+	display: block;
+	text-align: center;
+	color: #999;
+	margin-bottom: 20rpx;
+	font-size: 28rpx;
+	line-height: 36rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/user/workOrder.vue b/pages/user/workOrder.vue
index 7917dae..282cca9 100644
--- a/pages/user/workOrder.vue
+++ b/pages/user/workOrder.vue
@@ -197,7 +197,7 @@ export default {
 			this.telError = false
 		},
 		async checkPermision() {
-			var result = await permission.premissionCheck("CAMERA_EXTERNAL_STORAGE")
+			var result = await permission.premissionCheck("CAMERA")
 			if (result != 1) {
 				return false
 			}
diff --git a/static/icon/fugou.png b/static/icon/fugou.png
new file mode 100644
index 0000000..add72f0
Binary files /dev/null and b/static/icon/fugou.png differ
diff --git a/static/icon/icon_pxb.png b/static/icon/icon_pxb.png
new file mode 100644
index 0000000..6f538c7
Binary files /dev/null and b/static/icon/icon_pxb.png differ
diff --git a/static/icon/order_vip.png b/static/icon/order_vip.png
new file mode 100644
index 0000000..7c4c724
Binary files /dev/null and b/static/icon/order_vip.png differ
diff --git a/uni_modules/z-nav-bar/components/z-nav-bar/z-nav-bar.vue b/uni_modules/z-nav-bar/components/z-nav-bar/z-nav-bar.vue
index 05bfa9d..f44d48c 100644
--- a/uni_modules/z-nav-bar/components/z-nav-bar/z-nav-bar.vue
+++ b/uni_modules/z-nav-bar/components/z-nav-bar/z-nav-bar.vue
@@ -306,6 +306,7 @@ export default {
         return false;
       },
     },
+	backToMyPage: Boolean
   },
   data() {
     return {
@@ -416,6 +417,11 @@ export default {
       if (this.backState == 3000) {
         this.$emit("backClick");
       } else {
+		if (this.backToMyPage) {
+		  uni.switchTab({ url: '/pages/my/index' });
+		  
+		  return
+		}
 		this.$emit('back');
         uni.navigateBack();
       }
@@ -426,7 +432,7 @@ export default {
         this.$emit("homeClick");
       } else {
         uni.switchTab({
-          url: '/pages/homePage/index/index',
+          url: '/pages/home/index',
         });
       }
     },