diff --git a/common/commonJS.js b/common/commonJS.js
new file mode 100644
index 0000000..3307e75
--- /dev/null
+++ b/common/commonJS.js
@@ -0,0 +1,142 @@
+
+import uniCopy from '@/js_sdk/xb-copy/uni-copy.js'
+import $http from '@/config/requestConfig'
+import { mapState, mapMutations } from "vuex";
+
+export default {
+    ...mapMutations(["setUserInfo"]),
+
+    showToast(title, icon) {
+        return uni.showToast({
+            title: title,
+            icon: icon ? icon : 'none'
+        })
+    },
+    //拨打电话
+    handleMakingPhoneCalls(value, title) {
+        uni.showModal({
+            title: title ? title : '联系我们',
+            content: value,
+            confirmText: '确认',
+            success(res) {
+                if (res.confirm) {
+                    uni.makePhoneCall({
+                        phoneNumber: value, //电话号码
+                        success: function (e) {
+                            console.log(e);
+                        },
+                        fail: function (e) {
+                            console.log(e);
+                        }
+                    })
+                }
+            }
+        })
+    },
+    //复制内容
+    handleCopy(value, title) {
+        uniCopy({
+            content: value,
+            success: (res) => {
+                uni.showToast({
+                    title: title + '复制成功',
+                    icon: 'none'
+                })
+            },
+            error: (e) => {
+				
+            }
+        })
+    },
+
+    //用户协议
+   async getAgreement(id) {
+        console.log('id at line 56:', id)
+        var data = {
+            id: id
+        }
+        var result = {
+            title:'',
+            content:''
+        }
+      await  $http
+            .request({
+                url: "sys/agreement/getAgreement",
+                method: "POST",
+                data: data,
+                header: {
+                    "Content-Type": "application/json",
+                },
+            }).then((res) => {
+                console.log('res at line 111:', res)
+                if (res.code == 0) {
+                    result = res.agreement
+                }
+
+            })
+        return result
+    },
+    async getCheckCourseStatus(data) {
+        var result
+        await $http
+            .post('app/phone.do?getCheckCourseStatus', {
+                customerType
+                    :
+                    "D",
+                token
+                    : uni.getStorageSync("token")
+                ,
+                customerOid
+                    : uni.getStorageSync("customerOid"),
+                oid: data.oid
+            })
+            .then(async res => {
+                result = res.obj
+            })
+        return result
+    },
+    // 退出登录
+    signOut() {
+        uni.showModal({
+            title: "提示",
+            content: "确定要退出当前账户吗？",
+            success: function (res) {
+                if (res.confirm) {
+                    setUserInfo({ token: null });
+                    uni.reLaunch({
+                        url: "/pages/user/login",
+                    });
+                } else if (res.cancel) {
+                    // 取消操作
+                }
+            },
+        });
+    },  
+	// 注销账户
+    logout() {
+        let that = this;
+        uni.showModal({
+            title: "提示",
+            content: "确定要注销当前账户吗？",
+            success: function (res) {
+                if (res.confirm) {
+                    uni.showModal({
+                        title: "提示",
+                        showCancel: false,
+                        content: `注销申请已提交成功,请联系客服进行后续操作：022-24142321`,
+                        success: function (res1) {
+                            if (res1.confirm) {
+                                that.signOut();
+                            }
+                        },
+                    });
+                } else if (res.cancel) {
+                    // 取消操作
+                }
+            },
+        });
+    },
+
+
+}
+
diff --git a/config/baseUrl.js b/config/baseUrl.js
index 699e812..913a4c6 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -2,12 +2,12 @@ let baseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	//开发环境
-	//baseUrl = "https://api.nuttyreading.com/"; // 线上正式
-	baseUrl = "http://192.168.110.100:9200/pb/"; //  张川川
+	baseUrl = "https://api.nuttyreading.com/"; // 线上正式
+	//baseUrl = "http://192.168.110.100:9200/pb/"; //  张川川
 } else if (process.env.NODE_ENV === 'production') {
 	//生产环境
-	//baseUrl = "https://api.nuttyreading.com/";
-	baseUrl = "http://192.168.110.100:9200/pb/"; //  张川川
+	baseUrl = "https://api.nuttyreading.com/";
+	//baseUrl = "http://192.168.110.100:9200/pb/"; //  张川川
 }
 const courtConfig = {
 	//微信公众号APPID
diff --git a/main.js b/main.js
index b1587f3..1535ac2 100644
--- a/main.js
+++ b/main.js
@@ -16,8 +16,8 @@ import {
 Vue.prototype.$getHours = nowHour
 
 // 地址
-Vue.prototype.$baseUrl = "http://192.168.110.100:9100/pb/"
-//Vue.prototype.$baseUrl = "https://api.nuttyreading.com/"
+//Vue.prototype.$baseUrl = "http://192.168.110.100:9100/pb/"
+Vue.prototype.$baseUrl = "https://api.nuttyreading.com/"
 
 // 安卓安卓包下载地址
 // Vue.prototype.$apkUrl = "https://www.nuttyreading.com/nuttyreading.apk"    // 本地地址
@@ -59,6 +59,10 @@ Vue.prototype.$base = base;
 //挂载全局http请求
 import $http from '@/config/requestConfig'
 Vue.prototype.$http = $http;
+
+import commonJS from '@/common/commonJS.js'
+Vue.prototype.$commonJS = commonJS
+
 // #ifdef MP-WEIXIN
 //挂载全局微信分享
 import {
@@ -87,6 +91,8 @@ import commonCoupon from '@/pages/component/commonComponents/coupon/index.vue'
 Vue.component('common-coupon', commonCoupon);
 import commonList from '@/pages/component/commonComponents/list.vue'
 Vue.component('common-list', commonList);
+import commonGoodsNav from '@/pages/component/commonComponents/goodsNav.vue'
+Vue.component('common-goods-nav', commonGoodsNav);
 import commonAdvertisement from '@/pages/component/commonComponents/advertisement.vue'
 Vue.component('common-advertisement', commonAdvertisement);
 
diff --git a/manifest.json b/manifest.json
index 8b8003b..29fe891 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.2.71",
-    "versionCode" : 1271,
+    "versionName" : "1.2.72",
+    "versionCode" : 1272,
     "app-plus" : {
         "compatible" : {
             "ignoreVersion" : true
diff --git a/pages.json b/pages.json
index b94e0c0..9b5b9c1 100644
--- a/pages.json
+++ b/pages.json
@@ -164,6 +164,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/detail/orderLCont",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/user/bindPhone",
 			"style": {
diff --git a/pages/component/commonComponents/goodsNav.vue b/pages/component/commonComponents/goodsNav.vue
new file mode 100644
index 0000000..4cb2c83
--- /dev/null
+++ b/pages/component/commonComponents/goodsNav.vue
@@ -0,0 +1,97 @@
+<template>
+	<view class="goods_nav">
+		<view class="left">
+			<view v-for="(v,i) in iconList" class="icon_item" v-if="iconList.length>0">
+				<u-icon :name="v.icon" :color="v.infoColor" size="22" v-if="v.iconType" style="margin:0 auto"
+					@click="clickIcon(v)"></u-icon>
+
+				<uni-icons :type="v.icon" size="22" :color="v.infoColor" style="margin:0 auto" v-else> </uni-icons>
+				<view :style="`color:${v.infoColor};`">{{ v.text }}</view>
+			</view>
+			<slot name="leftSlot"></slot>
+		</view>
+		<view class="right">
+			<view class="button" v-for="(v,i) in customButton"
+				:style="`background:${v.backgroundColor} !important;color:${v.color};width:${v.width}`"
+				@click="submit(v)">
+				{{ v.text }}
+			</view>
+		</view>
+
+		<slot name="bottomSlot"></slot>
+	</view>
+</template>
+
+<script>
+	import $http from '@/config/requestConfig.js';
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		props: ['iconList', 'customButton'],
+		data() {
+			return {
+				
+			}
+		},
+		computed: {
+			...mapState(['userInfo']),
+		},
+		methods: {
+			submit(v) {
+				this.$emit('submit', v)
+			},
+			clickIcon(v) {
+				this.$emit('clickIcon', v)
+			},
+		},
+		onBackPress() {
+			// #ifdef APP-PLUS
+			plus.key.hideSoftKeybord();
+			// #endif
+		},
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.goods_nav {
+		background-color: #fff;
+		width: 100%;
+		padding: 20rpx 30rpx;
+		overflow: hidden;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		.left {
+			height: 100%;
+			float: left;
+			display: flex;
+			align-items: center;
+
+		}
+
+	}
+
+	.richDetail {
+		width: 100%;
+		height: 100%;
+	}
+
+	.button {
+		float: right;
+		width: 240rpx;
+		border-radius: 100rpx;
+		line-height: 70rpx;
+		text-align: center;
+		background: linear-gradient(90deg, rgb(254, 96, 53), rgb(239, 18, 36));
+		color: rgb(255, 255, 255);
+	}
+
+	.icon_item {
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/detail/orderLCont.vue b/pages/detail/orderLCont.vue
new file mode 100644
index 0000000..b985bc1
--- /dev/null
+++ b/pages/detail/orderLCont.vue
@@ -0,0 +1,1254 @@
+<template>
+  <view class="">
+    <z-nav-bar title="订单详情"> </z-nav-bar>
+    <view>
+      <view style="padding: 20rpx">
+        <view
+          v-if="
+            orderContet.orderType != 'point' &&
+            orderContet.addressId != 0 &&
+            orderContet.addressId != null
+          "
+          class="order_top common_radius_box color_shandow goods_box address_box">
+          <u-icon
+            name="map-fill"
+            color="#11a669"
+            size="20"
+            style="display: inline-block; margin-right: 10rpx"
+          ></u-icon>
+          <view class="normal_box">
+            <view class="normal_box_top">
+              <view class="curriulum_title">
+			    {{ orderContet.province }}
+                {{ orderContet.city }}
+                {{ orderContet.county }}
+                {{ orderContet.address }}
+			  </view>
+              <view class="user_info">
+                <text class="name">
+                  {{ orderContet.shippingUser }}
+                </text>
+                <text class="tel">
+                  {{ orderContet.userPhone }}
+                </text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <view class="orderList" v-if="consigneeShow">
+        <view
+          class=""
+          v-if="sheetList.length > 1 && orderContet.orderStatus == 2"
+          style="
+            background-color: rgb(113, 213, 161);
+            margin-bottom: 20rpx;
+            border-radius: 20rpx;
+            color: #fff;
+            font-size: 28rpx;
+            padding: 10rpx;
+          "
+        >
+          订单已被拆分成 {{ sheetList.length }} 个包裹
+        </view>
+        <view class="orderItem">
+          <view class="" style="position: relative; height: 60rpx">
+            <text
+              class="orderState orderState0"
+              v-if="orderContet.orderStatus == 0">待支付</text>
+            <text
+              class="orderState orderState1"
+              v-if="orderContet.orderStatus == 1">待发货</text>
+            <text
+              class="orderState orderState2"
+              v-if="orderContet.orderStatus == 2">待收货</text>
+            <text
+              class="orderState orderState3"
+              v-if="orderContet.orderStatus == 3">已完成</text>
+            <text
+              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_item" style="">
+            <view class="orderallpri">
+              <span style="color: #666; margin-right: 10rpx; float: left">商品总价 :
+              </span>
+              <span>￥</span>{{ orderContet.orderMoney }}
+            </view>
+            <view class="orderReal" v-if="orderContet.orderType == 'order'">
+              <span style="color: #666; margin-right: 10rpx; float: left">运费 :
+              </span>
+              <span>￥</span>{{ orderContet.shippingMoney }}
+            </view>
+			<view class="orderReal" v-if="orderContet.orderType == 'order'&&orderContet.vipDiscountAmount&&orderContet.vipDiscountAmount>0">
+			  <span style="color: red; margin-right: 10rpx; float: left;">VIP专享立减 :
+			  </span>
+			  <span style=" color: red;">-￥{{orderContet.vipDiscountAmount}}</span>
+			</view>
+			<view class="orderReal" v-if="orderContet.orderType == 'order'&&orderContet.districtMoney&&orderContet.districtMoney>0">
+			  <span style="color: red; margin-right: 10rpx; float: left;">活动立减 :
+			  </span>
+			  <span style=" color: red;">-￥{{orderContet.districtMoney}}</span>
+			</view>
+			<view class="orderReal" v-if="orderContet.jfDeduction > 0">
+				<span style="color: #666; margin-right: 10rpx; float: left"
+				>积分抵扣:
+				</span>
+				<span style="color: #fa2d12" v-if="orderContet.jfDeduction > 0"
+				>-&nbsp;&nbsp;</span
+				>
+				<span style="color: #fa2d12"> {{ orderContet.jfDeduction }}</span>
+			</view>
+			<view
+			  class="orderReal"
+			  v-if="orderContet.paymentMethod == 4 && orderContet.realMoney > 0"
+			>
+			  <span style="color: #666; margin-right: 10rpx; float: left"
+			    >天医币抵扣:
+			  </span>
+			  <span style="color: #fa2d12">-&nbsp;&nbsp;</span>
+			  <span style="color: #fa2d12">￥{{ orderContet.realMoney }}</span>
+			</view>
+			
+            <view class="orderReal" v-if="orderContet.orderStatus != 0">
+              <span style="color: #666; margin-right: 10rpx; float: left">
+				  实付款:
+              </span>
+			  <b v-if="orderContet.orderType == 'point'" style="color: #dd3c0c"
+			    >￥ {{ orderContet.bookBuyConfigEntity.realMoney }}</b
+			  >
+              <b style="color: #dd3c0c" v-else>
+                <template v-if="orderContet.realMoney">
+                  ￥{{ orderContet.realMoney }}
+              
+					  <text style="font-size: 24rpx;margin-left: 10rpx;">
+						<span
+						  style=""
+						  v-if="orderContet.paymentMethod == 1"
+						  >微信支付</span
+						>
+						<span
+						  style=""
+						  v-if="orderContet.paymentMethod == 2"
+						  >支付宝支付</span
+						>
+						<span
+						  style=""
+						  v-if="orderContet.paymentMethod == 3"
+						  >苹果支付</span
+						>
+						<span
+						  style=""
+						  v-if="orderContet.paymentMethod == 4"
+						>
+						  天医币支付
+						</span>
+					</text>
+                </template>
+				<template v-if="orderContet.realMoney == 0&&orderContet.jfDeduction==0">￥0</template>
+                <text
+                  style="margin: 0 4rpx"
+                  v-if="
+                    orderContet.realMoney > 0 && orderContet.jfDeduction > 0
+                  "
+                >
+                  +
+                </text>
+              
+                <text v-if="orderContet.jfDeduction > 0"
+                  >{{ orderContet.jfDeduction }} 积分</text
+                >
+				</b>
+            </view>
+			<view class="orderReal" v-if="orderContet.remark">
+				<span style="color: #666; margin-right: 10rpx; float: left">
+				 备注 :
+				</span>
+				<text style="color: #666; line-height: 36rpx; display: inline-block; max-width: 80%;">{{ orderContet.remark }}</text>
+			</view>
+          </view>
+          <view class="order_item">
+            <view class="orderYunf">
+              <span style="color: #666; float: left">订单编号 : </span>
+              <text style="font-size: 24rpx; color: #666">{{ orderContet.orderSn }}
+              </text>
+              <u-tag
+                @click="handleCopy(orderContet.orderSn, '订单编号')"
+                borderColor="#11a669"
+                color="#11a669"
+                text="复制"
+                plain
+                style="float: right; margin-left: 15rpx;"
+                size="mini"
+                type="success"
+              ></u-tag>
+            </view>
+            <view class="orderReal" style="    width: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;">
+              <span style="color: #666; margin-right: 10rpx; float: left">
+				  创建时间 :
+              </span>
+              <text style="font-size: 24rpx; color: #666">{{orderContet.createTime}}</text>
+            </view>
+            <view
+              class="orderReal"
+              v-if=" orderContet.orderStatus >= 1 && orderContet.orderStatus != 5 &&orderContet.paymentDate">
+              <span style="color: #666; margin-right: 10rpx; float: left">
+				  付款时间 :
+              </span>
+              <text style="font-size: 24rpx; color: #666">{{orderContet.paymentDate}}</text>
+            </view>
+          </view>
+          <view class=""></view>
+        </view>
+      </view>
+    </view>
+	<view class="goods_nav_box">
+	  <common-goods-nav
+	    :iconList="iconList"
+	    :customButton="customButton"
+	    @submit="goBuyJie"
+	    @clickIcon="clickIcon"
+	  >
+	    <!-- leftSlot -->
+	    <template slot="leftSlot" slot-scope="slotProps">
+	      <view
+	        class="price_box order_bottom_box"
+	        v-if="orderContet.orderStatus == 0"
+	      >
+	        <text class="price">
+				合计:
+	          <text class="total">￥{{ orderContet.realMoney }}</text>
+	        </text>
+	      </view>
+	    </template>
+	  </common-goods-nav>
+	</view>
+    
+    <u-popup
+      mode="bottom"
+      :show="sheetListShow"
+      :round="10"
+      @close="sheetListShow = false"
+    >
+      <view
+        class="tanchu expresslist"
+        style="height: 500rpx; overflow-y: scroll"
+      >
+        <view class="title"> 请选择要查看包裹 </view>
+        <view class="list">
+          <view
+            class="item"
+            v-for="(item, index) in sheetList"
+            @click="seeExpressDetails(item)"
+          >
+            <h4 style="margin-bottom: 10rpx">包裹 {{ index + 1 }}</h4>
+            <view class=""
+              >运单号：{{ item.expressOrderSn }}
+              <u-tag
+                @click="copyData(item.expressOrderSn)"
+                size="mini"
+                class="copyCode"
+                text="复制单号"
+                plain
+                type="success"
+            /></view>
+            <view class="">发货时间：{{ item.createTime }}</view>
+          </view>
+        </view>
+      </view>
+    </u-popup>
+  </view>
+</template>
+
+<script>
+import $http from "@/config/requestConfig.js";
+import { setPay, setPayAssign, setWXPay } from "@/config/utils";
+import { mapState } from "vuex";
+export default {
+  data() {
+    return {
+      iconList: [
+        {
+          text: "联系客服",
+          iconType: 1,
+          icon: "server-fill",
+          infoColor: "#666",
+        },
+      ],
+      userRecordid: null, // 用户的评价状态
+      playData: {},
+      title: "Hello",
+      isShowEmj: false,
+      emojiIcon: "cuIcon-emoji",
+      message: "",
+
+      windowWidth: 0,
+      windowHeight: 500,
+      Pform: {
+        // 评价表单
+        star: 0,
+        comment: "",
+        img: [],
+        html: "",
+      },
+      pingID: null,
+      productID: null, // 订单商品id
+      imageStyles: {
+        width: 64,
+        height: 64,
+        border: {
+          color: "#89aa7d",
+          width: 2,
+          style: "dashed",
+          radius: "2px",
+        },
+      },
+      logisticsData: [], // 快递信息列表
+      titleStat: "",
+      orderID: 0,
+      orderSn: "",
+      orderType: "",
+      orderContet: {},
+      goodsList: [],
+      deliverDetails: [
+        {
+          Traces: [],
+        },
+      ], // 物流详情信息全部
+      deliverDetailsLength: null,
+      emoji: [],
+      Files: [],
+      pjType: "",
+      sheetList: [], // 面单数据
+      consigneeShow: false,
+      sheetListShow: false,
+      customButton: [],
+    };
+  },
+  onLoad(e) {
+    this.windowWidth = uni.getSystemInfoSync().windowWidth;
+    this.orderID = e.orderId;
+    this.orderType = e.orderType;
+    this.orderSn = e.orderSn;
+    console.log(this.orderID, "this.orderID");
+  },
+  onHide() {
+    this.sheetList = [];
+  },
+  onShow() {
+    this.getOrderList();
+  },
+  computed: {
+    ...mapState(["userInfo"]),
+  },
+
+  methods: {
+    async goBuyJie(data) {
+      if (data.text == "继续付款") {
+        this.goPay(this.orderContet);
+      } else if (data.text == "取消订单") {
+        this.canceOrder();
+      } else if (data.text == "确认收货") {
+        this.OverOrder();
+      } else if (data.text == "查看物流") {
+        this.seeExpressDetail(this.orderContet);
+      }
+    },
+    async clickIcon(data) {
+      console.log("index at line 532:", data);
+      if (data.text == "联系客服") {
+        this.kefu();
+      }
+    },
+    // 复制到剪切板
+    copyData(data) {
+      uni.setClipboardData({
+        data,
+        success: function () {
+          console.log("success");
+        },
+      });
+    },
+    seeExpressDetails(item) {
+      console.log(item, "item");
+      uni.navigateTo({
+        url:
+          "./deliverDetail?orderSn=" +
+          this.orderContet.orderSn +
+          "&expressOrderSn=" +
+          item.expressOrderSn +
+          "&expressCompanyCode=" +
+          item.expressCompanyCode +
+          "&expressCompanyName=" +
+          item.expressCompanyName,
+      });
+    },
+
+    textareaBInput(e) {
+      this.Pform.comment = e.detail.value;
+    },
+    showEmj() {
+      let bool = !this.isShowEmj;
+      if (bool) {
+        this.emojiIcon = "cuIcon-keyboard";
+      } else {
+        this.emojiIcon = "cuIcon-emoji";
+      }
+
+      this.isShowEmj = bool;
+      this.$emit("show");
+    },
+    InputFocus(e) {
+      this.isShowEmj = false;
+      this.emojiIcon = "cuIcon-emoji";
+      this.$emit("foc");
+    },
+    getStar(i) {
+      this.Pform.star = i;
+    },
+    deletePic() {
+      let that = this;
+      that.Pform.img.splice(0, 1);
+    },
+    afterRead(e) {
+      let that = this;
+      for (var i = 0; i < e.file.length; i++) {
+        uni.uploadFile({
+          url: this.$baseUrl + "/oss/fileoss",
+          filePath: e.file[i].url,
+          name: "file",
+          formData: {},
+          success: (res) => {
+            that.Pform.img.push({
+              url: JSON.parse(res.data).url,
+            });
+          },
+        });
+      }
+    },
+    
+    // 联系客服
+    kefu() {
+      uni.showModal({
+        title: "提示",
+        content: "微信号：yilujiankangkefu",
+      });
+    },
+    // 查看物流
+    seeExpressDetail(item) {
+      if (this.sheetList.length > 1) {
+        this.sheetListShow = true;
+      } else if (this.sheetList.length == 1) {
+        // 直接展示详情
+        uni.navigateTo({
+          url:
+            "./deliverDetail?orderSn=" +
+            item.orderSn +
+            "&expressOrderSn=" +
+            this.sheetList[0].expressOrderSn,
+        });
+      }
+    },
+    handleCopy(value, title) {
+      this.$commonJS.handleCopy(value, title);
+    },
+    onPageJump(item) {
+      uni.navigateTo({
+        url: "./deliverDetail?objId=" + item,
+      });
+    },
+    OverOrder() {
+      // 确认收货
+      uni.showModal({
+        title: "提示",
+        content: "确认收货？",
+        success: (res) => {
+          let data = {
+            orderId: this.orderID,
+            orderStatus: "3",
+          };
+          if (res.confirm) {
+            uni.showLoading();
+            $http.request({
+                url: "book/buyOrder/update",
+                method: "POST",
+                data,
+                header: {
+                  "Content-Type": "application/json",
+                },
+              })
+              .then((res) => {
+                if (res.code == 0) {
+                  uni.hideLoading();
+                  uni.showToast({
+                    title: "收货成功",
+                    icon: "success",
+                    duration: 1000,
+                  });
+                  this.getOrderList();
+                }
+              });
+          } else if (res.cancel) {
+          }
+        },
+      });
+    },
+    // 切换订单状态
+    orderTabCLi(e) {
+      this.orderListTab = e;
+    },
+    // 获取订单详情
+    getOrderList() {
+      this.$http
+        .request({
+          url: "common/buyOrder/commonOrderDetail",
+          method: "POST",
+          data: {
+            orderId: this.orderID,
+          },
+          header: {
+            "Content-Type": "application/json",
+          },
+        })
+        .then((res) => {
+          this.customButton = [];
+          this.orderContet = res.data.buyOrder;
+          this.goodsList = res.data.productInfo;
+          this.consigneeShow = true;
+          if (
+            this.orderContet.orderStatus == 2 &&
+            this.sheetList.length > 0 &&
+            this.orderContet.orderStatus != 5
+          ) {
+            this.customButton.push({
+              width: "160rpx",
+              text: "查看物流",
+              color: "#333",
+              backgroundColor: "#f0f0f0",
+              color: "#fff",
+            });
+          }
+          if (this.orderContet.orderStatus == 2) {
+            this.customButton.push({
+              width: "160rpx",
+              text: "确认收货",
+
+              color: "#fff",
+            });
+          }
+          if (this.orderContet.orderStatus == 0) {
+            this.customButton.push({
+              width: "160rpx",
+              text: "继续付款",
+            });
+          }
+          if (this.orderContet.orderStatus == 0) {
+            this.customButton.push({
+              width: "160rpx",
+              text: "取消订单",
+              color: "#333",
+              backgroundColor: "#f0f0f0",
+            });
+          }
+          if (this.orderContet.orderStatus == 0) {
+            this.titleStat = "待支付";
+          } else if (this.orderContet.orderStatus == 1) {
+            this.titleStat = "待发货";
+          } else if (this.orderContet.orderStatus == 2) {
+            this.titleStat = "待收货";
+          } else if (this.orderContet.orderStatus == 3) {
+            this.titleStat = "已完成";
+          }
+          if (
+            this.orderContet.orderStatus >= 2 &&
+            this.orderContet.orderType == "order" &&
+            this.orderContet.expressOrders
+          ) {
+            this.sheetList = this.orderContet.expressOrders;
+          } else {
+            this.sheetList = [];
+          }
+          console.log(this.orderContet, "订单详情");
+        });
+    },
+
+    // 取消订单
+    canceOrder() {
+      uni.showModal({
+        title: "提示",
+        content: "确定要取消订单吗？",
+        confirmText: "取消订单",
+        cancelText: "考虑一下",
+        confirmColor: "#c96713",
+        cancelColor: "#555",
+        success: (res) => {
+          if (res.confirm) {
+            this.$http
+              .post(
+                "book/buyOrder/appDelete?orderId=" + this.orderContet.orderId
+              )
+              .then((res) => {
+                uni.showToast({
+                  icon: "none",
+                  title: "取消订单成功",
+                });
+                uni.switchTab({
+                  url: "./orderList",
+                });
+              });
+          }
+        },
+      });
+    },
+
+    // 支付
+    goPay(payItem) {
+      if (payItem.paymentMethod == 2) {
+        console.log("阿里支付");
+        setPay(
+          {
+            typePay: "alipay",
+            subject: "order",
+            totalAmount: payItem.realMoney,
+            type: 2,
+            relevanceoid: payItem.orderSn,
+            customerId: this.userInfo.id,
+          },
+          (res) => {
+            if (res.success) {
+              uni.showToast({
+                title: "支付成功",
+              });
+            } else {
+              uni.showToast({
+                title: "支付失败",
+                icon: "none"
+              });
+            }
+            this.getOrderList();
+          }
+        );
+      } else if (payItem.paymentMethod == 1) {
+        console.log("微信支付");
+        if (this.isAndorid == false) {
+          uni.showModal({
+            title: "提示",
+            content: "很抱歉，苹果系统暂不支持微信支付",
+            showCancel: false,
+          });
+          return false;
+        } else {
+          let data1 = {
+            orderSn: payItem.orderSn,
+            buyOrderId: null,
+            totalAmount: payItem.realMoney,
+          };
+          console.log(data1, "data1");
+          setWXPay(data1, (res) => {
+            if (res.success) {
+              uni.showToast({
+                title: "支付成功",
+              });
+            } else {
+              console.log(res);
+              if (res.data.errMsg.indexOf("User canceled") != -1) {
+                uni.showToast({
+                  title: "用户取消支付",
+                  icon: "none"
+                });
+              } else {
+                uni.showToast({
+                  title: "支付失败",
+                  icon: "none"
+                });
+              }
+            }
+          });
+        }
+      } else if (payItem.paymentMethod == 3) {
+        // 苹果充值
+        console.log("苹果二次支付");
+        if (this.isAndorid) {
+          uni.showModal({
+            title: "提示",
+            showCancel: false,
+            content:
+              "很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单",
+          });
+        } else {
+          this.iphonepay(payItem);
+        }
+      }
+    },
+
+    // 商品内容跳转
+    goDetail(id, data) {
+      if (data.delFlag == -1) {
+        this.$commonJS.showToast("商品已下架");
+      } else {
+        uni.navigateTo({
+          url: `/pages/goods/index?id=${id}`,
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+view,uni-view {
+  font-size: 28rpx;
+}
+.expresslist {
+  font-size: 28rpx;
+  color: #666;
+  .title {
+    text-align: center;
+  }
+  .item {
+    padding: 30rpx;
+    border-bottom: 1px solid #eee;
+  }
+}
+.orderState {
+  color: #fff;
+
+  position: absolute;
+  left: 0;
+  top: 0rpx;
+  padding: 6rpx 10rpx;
+  border-radius: 0 24rpx 24rpx 0;
+  font-size: 26rpx;
+  // font-weight: bold;
+  color: #fff;
+}
+.orderState0 {
+  background-color: #e6a23c;
+}
+.orderState1 {
+  background-color: #409eff;
+}
+.orderState2 {
+  background-color: #f56c6c;
+}
+.orderState3 {
+  background-color: #11a669;
+}
+.orderState5 {
+  background-color: #787878;
+}
+.guoqi {
+  font-size: 28rpx;
+  align-items: center;
+  color: red;
+  float: right;
+  line-height: 40rpx;
+}
+.star {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  margin-right: 10rpx;
+}
+.starGray {
+  background: url(../../static/icon/star_greey.png) no-repeat;
+  background-size: contain;
+}
+.starLight {
+  background: url(../../static/icon/star_light.png) no-repeat;
+  background-size: contain;
+}
+.cuIcon-emoji {
+  background: url(../../static/biaoqing.png) no-repeat;
+  background-size: contain;
+  display: block;
+  margin-right: 20rpx;
+  width: 30px;
+}
+.cuIcon-keyboard {
+  background: url(../../static/biaoqing.png) no-repeat;
+  background-size: contain;
+  display: block;
+  width: 30px;
+}
+.mb30 {
+  margin-bottom: 30rpx;
+  overflow: hidden;
+}
+.tanchu {
+  padding: 40rpx 30rpx 40rpx 30rpx;
+  position: relative;
+
+  .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 {
+    border: 1px solid #d9d9d9;
+    border-radius: 10rpx;
+    width: 100%;
+    display: flex;
+    padding: 20rpx 10rpx;
+    margin: 25rpx 0 0 0;
+    align-items: center;
+    background-color: #fff;
+    font-size: 30rpx;
+  }
+
+  .youhuiItem > view {
+    float: left;
+  }
+
+  .youhuiItem.youItem_style {
+    border-color: #fd6004;
+  }
+}
+.opShou {
+  border-color: $uni-color-success !important;
+}
+
+.adDefault {
+  padding: 30rpx 50rpx 30rpx 100rpx;
+  background-color: #fff;
+  border-top: 1px solid #eee;
+  border-bottom: 2px dashed #b2e9d7;
+  margin: 0 0 5rpx 0;
+  position: relative;
+
+  .defalTop {
+    .userName {
+      font-size: 35rpx;
+      font-weight: bold;
+      margin-right: 30rpx;
+    }
+
+    .userTel {
+      font-size: 25rpx;
+      color: #888;
+    }
+  }
+
+  .defalBottom {
+    .userAddress {
+      font-size: 32rpx;
+      line-height: 40rpx;
+    }
+  }
+
+  .defalLeft {
+    position: absolute;
+    left: 30rpx;
+    top: 55rpx;
+  }
+}
+
+.orderList {
+  padding: 20rpx;
+  padding-top: 0;
+
+  .orderItem {
+    padding: 30rpx 0rpx;
+    background-color: #fff;
+    border-radius: 10rpx;
+    margin-bottom: 30rpx;
+
+    .orderContent {
+      padding: 20rpx;
+      margin-bottom: 20rpx;
+
+      image {
+        width: 150rpx;
+        height: 180rpx;
+        margin-right: 20rpx;
+        float: left;
+      }
+      .goods_info {
+        float: left;
+        width: calc(100% - 180rpx) !important;
+        justify-content: space-between;
+      }
+      .itemJian {
+        width: 100%;
+        justify-content: space-between;
+        .orderTitle {
+          font-weight: bold;
+          font-size: 30rpx;
+          margin: 0 0 20rpx 0;
+          float: left;
+          width: 540rpx;
+        }
+
+        .orderPrice {
+          font-size: 28rpx;
+          float: right;
+          width: 60rpx;
+          text-align: right;
+          line-height: 40rpx;
+        }
+      }
+    }
+
+    .orderallpri {
+      text-align: right;
+      margin: 10rpx 0;
+      font-size: 28rpx;
+    }
+
+    .orderReal {
+      text-align: right;
+      font-size: 28rpx;
+      margin: 10rpx 0;
+	  overflow: hidden;
+	}
+
+    .orderYunf {
+      text-align: right;
+
+      font-size: 28rpx;
+    }
+
+    .orderOper {
+      text-align: right;
+      margin: 40rpx 20rpx 0 0;
+
+      view {
+        margin-left: 20rpx;
+        padding: 10rpx 0;
+        display: inline-block;
+        width: 160rpx;
+        font-size: 25rpx;
+        text-align: center;
+      }
+
+      .opFix {
+        color: #555;
+        border: 1px solid #ddd;
+        border-radius: 30rpx;
+      }
+
+      .opCan {
+        color: #c96713;
+        border: 1px solid #eba00b;
+        border-radius: 30rpx;
+      }
+      .kefu {
+        float: left;
+      }
+    }
+  }
+}
+.copyCode {
+  display: inline-block;
+  margin-left: 20rpx;
+}
+.deliverCntent {
+  padding: 32rpx;
+  position: relative;
+  background-color: #fff;
+  margin-bottom: 20rpx;
+  border-top: 1px solid #eee;
+  font-size: 28rpx;
+}
+
+.flexbox {
+  display: flex;
+}
+
+.img_icon {
+  padding-right: 5px;
+}
+
+.moreBtnF {
+  align-items: center;
+  padding: 30rpx;
+  height: 100%;
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 1;
+  background-color: rgba(255, 255, 255, 0.9);
+}
+
+.wuliu {
+  .time {
+    color: #888;
+  }
+
+  .moreBtn {
+    display: inline-block;
+    width: 50px;
+  }
+}
+.address_box {
+  background-color: #fff;
+  display: flex;
+  align-items: center;
+  .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;
+  }
+}
+.feng {
+  background-color: #fafafa;
+  margin: 0rpx 22rpx 0 0;
+  height: 140rpx !important;
+  width: 140rpx !important;
+  float: left;
+  border-radius: 14rpx;
+  // border: 1rpx solid #e9e9e9;
+}
+.booknameleft {
+  font-size: 32rpx;
+  width: calc(100% - 100rpx);
+  color: #070707;
+  letter-spacing: 0.5rpx;
+  font-weight: 600;
+}
+.order_item {
+  padding: 20rpx 20rpx;
+  border-top: 1px solid #eee;
+}
+/deep/.goods_nav_box {
+	box-shadow: 0 4rpx 48rpx 0 rgba(0, 0, 0, .15);
+	width: 100%;
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	
+  .left {
+    margin-top: -10rpx;
+    width: auto;
+    height: auto;
+    position: relative;
+    // overflow: hidden;
+  }
+}
+.delisted {
+  background-color: red;
+  color: #fff;
+  // padding: 2rpx 4rpx;
+  position: absolute;
+  border-radius: 4rpx;
+  font-size: 22rpx;
+  width: 100rpx;
+  text-align: center;
+  height: 40rpx;
+  line-height: 40rpx;
+  left: calc((100% - 100rpx) / 2);
+  top: calc((100% - 40rpx) / 2);
+}
+.order_bottom_box {
+  margin-left: 20rpx;
+
+  .number {
+    font-size: 28rpx;
+    margin-right: 15rpx;
+    margin-top: 5rpx;
+  }
+
+  .price {
+    .total {
+      font-size: 38rpx;
+      color: red;
+    }
+  }
+}
+.vip_year{
+	padding-left: 20rpx;
+	color: #f5342b;
+	font-size: 30rpx;
+}
+</style>
diff --git a/pages/user/persCount.vue b/pages/user/persCount.vue
index b08eb50..16b8980 100644
--- a/pages/user/persCount.vue
+++ b/pages/user/persCount.vue
@@ -33,7 +33,7 @@
 			<view v-if="tab_muJian==0">
 				<view class="AC_con">
 					<view class="AC_jilu PM_font">充值消费记录</view>
-					<view v-for="(item,index) in MoneyRecord" class="AC_List">
+					<view v-for="(item,index) in MoneyRecord" class="AC_List" @click="goClick(item)">
 						<view class="AC_title">
 							{{item.orderType}}
 							<view>
@@ -225,6 +225,14 @@
 		},
 		//方法
 		methods: {
+			//列表跳转到详情
+			goClick(data){
+				if(data.relationId){
+					uni.navigateTo({
+						url: "/pages/detail/orderLCont?orderId=" + data.relationId
+					});
+				}
+			},
 			// 获取
 			getData() {
 				if(!this.iosHide){
@@ -356,10 +364,9 @@
 					display: inline-block;
 				}
 			}
-
-
-
-
+			.AC_List:last-child{
+				border-bottom: 0;
+			}
 		}
 
 		.couponList {
diff --git a/static/icon/pay_3.png b/static/icon/pay_3.png
new file mode 100644
index 0000000..9a0b1b5
Binary files /dev/null and b/static/icon/pay_3.png differ