diff --git a/.DS_Store b/.DS_Store
index 1710e34..32d8752 100644
--- a/.DS_Store
+++ b/.DS_Store
diff --git a/main.js b/main.js
index fbe0124..f27b100 100644
--- a/main.js
+++ b/main.js
@@ -1,20 +1,20 @@
-import Vue from 'vue';
-import App from './App';
-import apis from './apis/index.js'
-import uView from "uview-ui";
-
-Vue.prototype.API = apis;
-
-Vue.prototype.Baseapi = "http://8.130.38.56:2015";
-
-Vue.config.productionTip = false
-
-Vue.use(uView);
-// 全局组件
-
-App.mpType = 'app'
-
-const app = new Vue({
-    ...App
-})
-app.$mount()
+import Vue from 'vue';
+import App from './App';
+import apis from './apis/index.js'
+import uView from "uview-ui";
+
+Vue.prototype.API = apis;
+
+Vue.prototype.Baseapi = "http://zhmz.rsxmzj.cn:8536";
+
+Vue.config.productionTip = false
+
+Vue.use(uView);
+// 全局组件
+
+App.mpType = 'app'
+
+const app = new Vue({
+    ...App
+})
+app.$mount()
diff --git a/pages/institutiondetail/institutiondetail.vue b/pages/institutiondetail/institutiondetail.vue
index 9c212e3..28bf968 100644
--- a/pages/institutiondetail/institutiondetail.vue
+++ b/pages/institutiondetail/institutiondetail.vue
@@ -1,121 +1,121 @@
-<template>
-  <view>
-    <pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
-    <view class="listBox" :style="{'padding-top':(pageTop+'px')}">
-    <view class="content">
-		<!-- banner，标题 -->
-		<view class="banner-title">
-			<view>
-				<view class="navTab">
-						<scroll-view :scroll-x="true" style="white-space: nowrap;">
-							<view class="tabBox">
-								<view class="tabList" v-for="item in info.image">
-									<image :src="Baseapi + item"></image>
-								</view>
-							</view>
-						</scroll-view>
-					</view>
-			</view>
-		  <!-- 标题 -->
-		  <view class="goods-title">
-			<view class="big">{{info.name}}</view>
-			<view class="goods-small">
-				<view class="goods-small-left">
-					<view class="goods-small-left-list"><image src="../../static/institution1.png"></image>{{info.address}}</view>
-					<view class="goods-small-left-list"><image src="../../static/institution2.png"></image>{{info.operatingHours}}</view>
-				</view>
-				<view class="goods-small-right" @click="open">
-					<view><image src="../../static/phone2.png"></image></view>
-					<view>电话</view>
-				</view>
-			</view>
-			<view v-html="info.introduction"></view>
-		  </view>
-		</view>
-		<!-- 商品介绍 -->
-		<view class="products-introduction" ref="products">
-		  <view class="content-box">
-			  <image v-for="item in info.image" :src="Baseapi + item"></image>
-		  </view>
-		</view>
-		<!-- 底部 -->
-		<view class="page-footer">
-			<view class="footer-buy" style="display: flex;justify-content: center;">
-				<view class="cart-add" @click="open">
-					<view><image src="../../static/btn2.png"></image></view>
-					<view class="cart-add-text"><image src="../../static/phone.png"></image><text>联系电话</text></view>
-				</view>
-				<!-- <view class="buy-at">
-					<image src="../../static/btn1.png"></image>
-				  <text>立即购买</text>
-				</view> -->
-			  </view>
-			</view>
-		</view>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-		Baseapi:"http://8.130.38.56:2015",
-		nvConfig:{
-			title:"殡葬服务机构详情",
-			bgColor:"#ffffff",
-			color:"#000000",
-			fixedAssist:{
-				hide:true,
-			},
-		},
-		swiperList: [
-			{
-			  id: 0,
-			  type: 'image',
-			  url: '/static/img/01.jpg'
-			},
-			{
-			  id: 1,
-			  type: 'image',
-			  url: '/static/img/01.jpg'
-			},
-		],
-	  
-		info:{},
-		contentshow:false,
-		contentNumber: 10086,
-    };
-  },
-	onPageScroll(e) {this.$refs.nv.pageScroll(e)},
-	computed:{
-		pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
-	},
-	onLoad(e) {
-		this.info = JSON.parse(e.info)
-		console.log(this.info.name);
-		console.log("上一个页面的值",e,this.info);
-	},
-	methods: {
-		open(){
-			console.log("123",this.contentshow);
-			var that = this
-			uni.showModal({
-				title: '联系电话',
-				content: '拨打电话:' + that.contentNumber,
-				success: function (res) {
-					if (res.confirm) {
-						console.log('用户点击确定');
-					} else if (res.cancel) {
-						console.log('用户点击取消');
-					}
-				}
-			});
-		},
-	}
-};
-</script>
-
-<style scoped lang="scss">
-@import 'institutiondetail.scss';
-</style>
+<template>
+  <view>
+    <pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
+    <view class="listBox" :style="{'padding-top':(pageTop+'px')}">
+    <view class="content">
+		<!-- banner，标题 -->
+		<view class="banner-title">
+			<view>
+				<view class="navTab">
+						<scroll-view :scroll-x="true" style="white-space: nowrap;">
+							<view class="tabBox">
+								<view class="tabList" v-for="item in info.image">
+									<image :src="Baseapi + item"></image>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+			</view>
+		  <!-- 标题 -->
+		  <view class="goods-title">
+			<view class="big">{{info.name}}</view>
+			<view class="goods-small">
+				<view class="goods-small-left">
+					<view class="goods-small-left-list"><image src="../../static/institution1.png"></image>{{info.address}}</view>
+					<view class="goods-small-left-list"><image src="../../static/institution2.png"></image>{{info.operatingHours}}</view>
+				</view>
+				<view class="goods-small-right" @click="open">
+					<view><image src="../../static/phone2.png"></image></view>
+					<view>电话</view>
+				</view>
+			</view>
+			<view v-html="info.introduction"></view>
+		  </view>
+		</view>
+		<!-- 商品介绍 -->
+		<view class="products-introduction" ref="products">
+		  <view class="content-box">
+			  <image v-for="item in info.image" :src="Baseapi + item"></image>
+		  </view>
+		</view>
+		<!-- 底部 -->
+		<view class="page-footer">
+			<view class="footer-buy" style="display: flex;justify-content: center;">
+				<view class="cart-add" @click="open">
+					<view><image src="../../static/btn2.png"></image></view>
+					<view class="cart-add-text"><image src="../../static/phone.png"></image><text>联系电话</text></view>
+				</view>
+				<!-- <view class="buy-at">
+					<image src="../../static/btn1.png"></image>
+				  <text>立即购买</text>
+				</view> -->
+			  </view>
+			</view>
+		</view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+		Baseapi:"http://zhmz.rsxmzj.cn:8536",
+		nvConfig:{
+			title:"殡葬服务机构详情",
+			bgColor:"#ffffff",
+			color:"#000000",
+			fixedAssist:{
+				hide:true,
+			},
+		},
+		swiperList: [
+			{
+			  id: 0,
+			  type: 'image',
+			  url: '/static/img/01.jpg'
+			},
+			{
+			  id: 1,
+			  type: 'image',
+			  url: '/static/img/01.jpg'
+			},
+		],
+	  
+		info:{},
+		contentshow:false,
+		contentNumber: 10086,
+    };
+  },
+	onPageScroll(e) {this.$refs.nv.pageScroll(e)},
+	computed:{
+		pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
+	},
+	onLoad(e) {
+		this.info = JSON.parse(e.info)
+		console.log(this.info.name);
+		console.log("上一个页面的值",e,this.info);
+	},
+	methods: {
+		open(){
+			console.log("123",this.contentshow);
+			var that = this
+			uni.showModal({
+				title: '联系电话',
+				content: '拨打电话:' + that.contentNumber,
+				success: function (res) {
+					if (res.confirm) {
+						console.log('用户点击确定');
+					} else if (res.cancel) {
+						console.log('用户点击取消');
+					}
+				}
+			});
+		},
+	}
+};
+</script>
+
+<style scoped lang="scss">
+@import 'institutiondetail.scss';
+</style>
diff --git a/pages/mall/mall.vue b/pages/mall/mall.vue
index 70803dd..9daafdf 100644
--- a/pages/mall/mall.vue
+++ b/pages/mall/mall.vue
@@ -1,170 +1,170 @@
-<template>
-	<view class="page">
-		<view class="bg">
-			<image src="/static/bg.jpg"></image>
-		</view>
-		<view class="back" @click="home">
-			<image src="../../static/left.png"></image>
-		</view>
-		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
-		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
-			<view class="content">
-				<view class="search-index">
-					<view class="search">
-						<view class="iconfont">
-							<image src="../../static/search.png"></image>
-						</view>
-						<text class="shu">|</text>
-						<input type="text" placeholder="请输入关键词" />
-					</view>
-				</view>
-
-				<!-- 分类数据 -->
-				<view class="classify-data">
-					<view class="classify-one">
-						<scroll-view scroll-y class="classify-list">
-							<!-- <view class="list action">
-								<text>全部</text>
-							</view> -->
-							<view class="list" @click="dhxz(index,item.name)" :class="{ 'action': item.checked }" v-for="(item,index) in navigation" :key="index">
-								<text>{{item.name}}</text>
-							</view>
-						</scroll-view>
-					</view>
-					<view class="classify-two-three">
-						<scroll-view scroll-y class="scroll">
-							<view class="goods-list" v-for="item in list">
-								<view class="goods">
-									<view class="thumb">
-										<image :src="Baseapi + item.productImage" mode=""></image>
-									</view>
-									<view class="item">
-										<view class="goods-name">
-											<view class="goods-name-title">{{item.productName}}</view>
-											<view>{{item.briefIntro}}</view>
-										</view>
-										<view class="status-btn" @click="mallgoods(item)">
-											<view class="btn">
-												<text>购买</text>
-											</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</scroll-view>
-					</view>
-				</view>
-
-			</view>
-		</view>
-		<!-- tabbar -->
-		<TabBar :tabBarShow="2"></TabBar>
-	</view>
-</template>
-
-<script>
-	import TabBar from '../../components/TabBar/TabBar.vue';
-	export default {
-		components: {
-			TabBar
-		},
-		data() {
-			return {
-				Baseapi:"http://8.130.38.56:2015",
-				nvConfig: {
-					title: "殡葬公共服务",
-					bgColor: "#ffffff",
-					color: "#000000",
-					fixedAssist: {
-						hide: true,
-					},
-					transparent: {
-						initColor: "#000",
-					},
-					back: {
-						hide: true
-					},
-				},
-				navigation:[
-					{
-						name:"全部",
-						checked:true
-					},
-					{
-						name:"分类一",
-						checked:false
-					},
-					{
-						name:"分类二",
-						checked:false
-					},
-				],
-				list:[],
-				lists:[],
-			};
-		},
-		onPageScroll(e) {
-			this.$refs.nv.pageScroll(e)
-		},
-		computed: {
-			pageTop() {
-				return parseInt(88 * uni.getSystemInfoSync().windowWidth / 750) + uni.getSystemInfoSync().statusBarHeight
-			}
-		},
-		onLoad() {
-			uni.hideTabBar();
-			this.getcpxq();
-		},
-		onshow(){
-			this.getcpxq();
-		},
-		methods: {
-			home() {
-				uni.navigateTo({
-					url: '/pages/home/home'
-				})
-			},
-			mallgoods(item) {
-				var info = JSON.stringify(item)
-				uni.navigateTo({
-					url: '/pages/mallgoods/mallgoods?info=' + info
-				})
-			},
-			// 导航选择
-			dhxz(index,name){
-				console.log(index,name);
-				this.list = []
-				for(let i = 0;i < this.navigation.length;i++){
-					if(index == i){
-						this.navigation[i].checked = true
-					}else{
-						this.navigation[i].checked = false
-					}
-				}
-				for(var i = 0;i < this.lists.length;i++){
-					if(name == '全部'){
-						this.list = this.lists 
-						return
-					}
-					console.log(this.lists[i].productCategory,name);
-					if(this.lists[i].productCategory == name){
-						this.list.push(this.lists[i])
-					}
-				}
-				
-			},
-			// 获取列表数据
-			getcpxq(){
-				this.API.getcpxq().then(res=>{
-					console.log("列表数据",res);
-					this.list = res.rows;
-					this.lists = res.rows;
-				})
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	@import 'mall.scss';
-</style>
+<template>
+	<view class="page">
+		<view class="bg">
+			<image src="/static/bg.jpg"></image>
+		</view>
+		<view class="back" @click="home">
+			<image src="../../static/left.png"></image>
+		</view>
+		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
+		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
+			<view class="content">
+				<view class="search-index">
+					<view class="search">
+						<view class="iconfont">
+							<image src="../../static/search.png"></image>
+						</view>
+						<text class="shu">|</text>
+						<input type="text" placeholder="请输入关键词" />
+					</view>
+				</view>
+
+				<!-- 分类数据 -->
+				<view class="classify-data">
+					<view class="classify-one">
+						<scroll-view scroll-y class="classify-list">
+							<!-- <view class="list action">
+								<text>全部</text>
+							</view> -->
+							<view class="list" @click="dhxz(index,item.name)" :class="{ 'action': item.checked }" v-for="(item,index) in navigation" :key="index">
+								<text>{{item.name}}</text>
+							</view>
+						</scroll-view>
+					</view>
+					<view class="classify-two-three">
+						<scroll-view scroll-y class="scroll">
+							<view class="goods-list" v-for="item in list">
+								<view class="goods">
+									<view class="thumb">
+										<image :src="Baseapi + item.productImage" mode=""></image>
+									</view>
+									<view class="item">
+										<view class="goods-name">
+											<view class="goods-name-title">{{item.productName}}</view>
+											<view>{{item.briefIntro}}</view>
+										</view>
+										<view class="status-btn" @click="mallgoods(item)">
+											<view class="btn">
+												<text>购买</text>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+				</view>
+
+			</view>
+		</view>
+		<!-- tabbar -->
+		<TabBar :tabBarShow="2"></TabBar>
+	</view>
+</template>
+
+<script>
+	import TabBar from '../../components/TabBar/TabBar.vue';
+	export default {
+		components: {
+			TabBar
+		},
+		data() {
+			return {
+				Baseapi:"http://zhmz.rsxmzj.cn:8536",
+				nvConfig: {
+					title: "殡葬公共服务",
+					bgColor: "#ffffff",
+					color: "#000000",
+					fixedAssist: {
+						hide: true,
+					},
+					transparent: {
+						initColor: "#000",
+					},
+					back: {
+						hide: true
+					},
+				},
+				navigation:[
+					{
+						name:"全部",
+						checked:true
+					},
+					{
+						name:"分类一",
+						checked:false
+					},
+					{
+						name:"分类二",
+						checked:false
+					},
+				],
+				list:[],
+				lists:[],
+			};
+		},
+		onPageScroll(e) {
+			this.$refs.nv.pageScroll(e)
+		},
+		computed: {
+			pageTop() {
+				return parseInt(88 * uni.getSystemInfoSync().windowWidth / 750) + uni.getSystemInfoSync().statusBarHeight
+			}
+		},
+		onLoad() {
+			uni.hideTabBar();
+			this.getcpxq();
+		},
+		onshow(){
+			this.getcpxq();
+		},
+		methods: {
+			home() {
+				uni.navigateTo({
+					url: '/pages/home/home'
+				})
+			},
+			mallgoods(item) {
+				var info = JSON.stringify(item)
+				uni.navigateTo({
+					url: '/pages/mallgoods/mallgoods?info=' + info
+				})
+			},
+			// 导航选择
+			dhxz(index,name){
+				console.log(index,name);
+				this.list = []
+				for(let i = 0;i < this.navigation.length;i++){
+					if(index == i){
+						this.navigation[i].checked = true
+					}else{
+						this.navigation[i].checked = false
+					}
+				}
+				for(var i = 0;i < this.lists.length;i++){
+					if(name == '全部'){
+						this.list = this.lists 
+						return
+					}
+					console.log(this.lists[i].productCategory,name);
+					if(this.lists[i].productCategory == name){
+						this.list.push(this.lists[i])
+					}
+				}
+				
+			},
+			// 获取列表数据
+			getcpxq(){
+				this.API.getcpxq().then(res=>{
+					console.log("列表数据",res);
+					this.list = res.rows;
+					this.lists = res.rows;
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'mall.scss';
+</style>
diff --git a/pages/mallgoods/mallgoods.vue b/pages/mallgoods/mallgoods.vue
index 39ce182..43d6802 100644
--- a/pages/mallgoods/mallgoods.vue
+++ b/pages/mallgoods/mallgoods.vue
@@ -1,227 +1,227 @@
-<template>
-  <view>
-    <pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
-    <view class="listBox" :style="{'padding-top':(pageTop+'px')}">
-    <view class="content">
-    <!-- banner，标题 -->
-    <view class="banner-title">
-      <!-- banner -->
-      <view class="banner">
-        <swiper class="screen-swiper round-dot" indicator-dots="true" circular="true" autoplay="true" interval="5000"
-                duration="500">
-          <swiper-item v-for="(item, index) in swiperList" :key="index">
-            <image :src="Baseapi + info.productImage"></image>
-          </swiper-item>
-        </swiper>
-      </view>
-      <!-- 价格 -->
-      <view class="price-info">
-        <view class="price">
-          <text class="min">￥</text>
-          <text class="max">{{info.price}}.00</text>
-        </view>
-		<view class="">
-			<u-number-box v-model="number">
-				<view
-					slot="minus"
-					class="minus"
-				>
-					<u-icon
-						name="minus"
-						size="12"
-					></u-icon>
-				</view>
-				<text
-					slot="input"
-					style="width: 50px;text-align: center;"
-					class="input"
-				>{{number}}</text>
-				<view
-					slot="plus"
-					class="plus"
-				>
-					<u-icon
-						name="plus"
-						color="#FFFFFF"
-						size="12"
-					></u-icon>
-				</view>
-			</u-number-box>
-		</view>
-		<view class="serve">
-			<view class="" style="font-size: 32rpx;font-weight: 600;display: flex;" @click="bspersonshow = true">{{bspersoninfo.name}} <u-icon name="arrow-down-fill" color="#2979ff" size="20"></u-icon></view>
-		</view>
-      </view>
-	  <u-picker :show="bspersonshow"  @confirm="bspersonconfirm" @cancel="bspersonclose" :columns="bspersoncolumns"></u-picker>
-      <!-- 标题 -->
-      <view class="goods-title">
-        <view class="big">{{info.productName}}</view>
-		<view class="goods-icon">
-			<view class="goods-icon-bg">{{info.specification}}</view>
-		</view>
-		<view>{{info.briefIntro}}</view>
-      </view>
-    </view>
-    <!-- 商品介绍 -->
-    <view class="products-introduction" ref="products">
-      <view class="content-box">
-		  <image :src="Baseapi + info.productImage"></image>
-	  </view>
-    </view>
-    <!-- 底部 -->
-    <view class="page-footer">
-      <view class="footer-buy">
-        <!-- <view class="cart-add">
-			<image src="../../static/btn2.png"></image>
-          <text><image src="../../static/phone.png"></image>联系电话</text>
-        </view> -->
-        <view style="width: 100%;" class="buy-at" @click="addproduct">
-			<image src="../../static/btn1.png"></image>
-          <text>立即购买</text>
-        </view>
-      </view>
-    </view>
-    </view>
-    </view>
-	<u-toast ref="uToast"></u-toast>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-		Baseapi:"http://8.130.38.56:2015",
-      nvConfig:{
-      	title:"商品详情",
-      	bgColor:"#ffffff",
-      	color:"#000000",
-      	fixedAssist:{
-      		hide:true,
-      	},
-      },
-      swiperList: [
-        {
-          id: 0,
-          type: 'image',
-          url: '/static/img/01.jpg'
-        },
-      ],
-	  info:{},
-	  
-	  bspersoninfo:{
-	  	name:"",
-	  	obituaryOrderNumber:"",
-	  },
-	  bspersonshow:false,
-	  bspersonlist:[],
-	  bspersoncolumns:[],
-	  
-	  // 数量
-	  number:1,
-    };
-  },
-	onPageScroll(e) {this.$refs.nv.pageScroll(e)},
-	computed:{
-		pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
-	},
-	onLoad(item) {
-		this.info = JSON.parse(item.info)
-		console.log(this.info);
-		this.getbsinfo();
-	},
-  methods: {
-	  // 获取用户的报丧记录
-	  getbsinfo(){
-	  	console.log("userinfo",uni.getStorageSync("USERS_KEY"));
-	  	var info = {
-	  		userId:uni.getStorageSync("USERS_KEY").userId
-	  	}
-	  	this.API.getbsinfo(info).then(res=>{
-	  		console.log("获取用户报丧信息",res);
-	  		this.bzpersonlist = res.rows;
-	  		this.bspersoninfo.name = res.rows[0].deceasedName
-	  		this.bspersoninfo.obituaryOrderNumber = res.rows[0].orderNumber
-	  		var info = []
-	  		for(let i = 0;i < res.rows.length;i++){
-	  			info.push(res.rows[i].deceasedName)
-	  		}
-	  		this.bspersoncolumns.push(info)
-	  	})
-	  },
-	  // 报丧人确定
-	  bspersonconfirm(e){
-	  	this.bspersonshow = false
-	  	this.bspersoninfo.name = e.value[0]
-	  	this.bspersoninfo.obituaryOrderNumber = this.bspersonlist[e.indexs[0]].orderNumber
-	  },
-	  bspersonclose(){
-	  	this.bspersonshow = false
-	  },
-	  addproduct(){
-		  console.log(uni.getStorageSync('USERS_KEY'));
-		  var info = {
-			userId:0,
-			productId:"",
-			productTotal:this.number,
-			orderNumber:"",
-		  }
-		  info.userId = uni.getStorageSync('USERS_KEY').userId;
-		  info.productId = this.info.productId;
-		  info.orderNumber = this.bspersoninfo.obituaryOrderNumber
-		  console.log("提交数据",info);
-		  // return
-		  this.API.addproduct(info).then(res=>{
-			  console.log("商品订单",res);
-			  if(res.code == 200){
-				  this.$refs.uToast.show({
-				  	type: 'success',
-				  	title: '成功主题(带图标)',
-				  	message: "购买成功",
-				  	iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
-				  })
-				  setTimeout(function () {
-				      uni.navigateBack({
-				          delta: 1
-				      });
-				  }, 2000);
-			  }
-		  })
-	  },
-  }
-};
-</script>
-
-<style scoped lang="scss">
-@import 'mallgoods.scss';
-.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: rgb(84, 125, 255);
-		border-radius: 50%;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		justify-content: center;
-		align-items: center;
-	}
-</style>
+<template>
+  <view>
+    <pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
+    <view class="listBox" :style="{'padding-top':(pageTop+'px')}">
+    <view class="content">
+    <!-- banner，标题 -->
+    <view class="banner-title">
+      <!-- banner -->
+      <view class="banner">
+        <swiper class="screen-swiper round-dot" indicator-dots="true" circular="true" autoplay="true" interval="5000"
+                duration="500">
+          <swiper-item v-for="(item, index) in swiperList" :key="index">
+            <image :src="Baseapi + info.productImage"></image>
+          </swiper-item>
+        </swiper>
+      </view>
+      <!-- 价格 -->
+      <view class="price-info">
+        <view class="price">
+          <text class="min">￥</text>
+          <text class="max">{{info.price}}.00</text>
+        </view>
+		<view class="">
+			<u-number-box v-model="number">
+				<view
+					slot="minus"
+					class="minus"
+				>
+					<u-icon
+						name="minus"
+						size="12"
+					></u-icon>
+				</view>
+				<text
+					slot="input"
+					style="width: 50px;text-align: center;"
+					class="input"
+				>{{number}}</text>
+				<view
+					slot="plus"
+					class="plus"
+				>
+					<u-icon
+						name="plus"
+						color="#FFFFFF"
+						size="12"
+					></u-icon>
+				</view>
+			</u-number-box>
+		</view>
+		<view class="serve">
+			<view class="" style="font-size: 32rpx;font-weight: 600;display: flex;" @click="bspersonshow = true">{{bspersoninfo.name}} <u-icon name="arrow-down-fill" color="#2979ff" size="20"></u-icon></view>
+		</view>
+      </view>
+	  <u-picker :show="bspersonshow"  @confirm="bspersonconfirm" @cancel="bspersonclose" :columns="bspersoncolumns"></u-picker>
+      <!-- 标题 -->
+      <view class="goods-title">
+        <view class="big">{{info.productName}}</view>
+		<view class="goods-icon">
+			<view class="goods-icon-bg">{{info.specification}}</view>
+		</view>
+		<view>{{info.briefIntro}}</view>
+      </view>
+    </view>
+    <!-- 商品介绍 -->
+    <view class="products-introduction" ref="products">
+      <view class="content-box">
+		  <image :src="Baseapi + info.productImage"></image>
+	  </view>
+    </view>
+    <!-- 底部 -->
+    <view class="page-footer">
+      <view class="footer-buy">
+        <!-- <view class="cart-add">
+			<image src="../../static/btn2.png"></image>
+          <text><image src="../../static/phone.png"></image>联系电话</text>
+        </view> -->
+        <view style="width: 100%;" class="buy-at" @click="addproduct">
+			<image src="../../static/btn1.png"></image>
+          <text>立即购买</text>
+        </view>
+      </view>
+    </view>
+    </view>
+    </view>
+	<u-toast ref="uToast"></u-toast>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+		Baseapi:"http://zhmz.rsxmzj.cn:8536",
+      nvConfig:{
+      	title:"商品详情",
+      	bgColor:"#ffffff",
+      	color:"#000000",
+      	fixedAssist:{
+      		hide:true,
+      	},
+      },
+      swiperList: [
+        {
+          id: 0,
+          type: 'image',
+          url: '/static/img/01.jpg'
+        },
+      ],
+	  info:{},
+	  
+	  bspersoninfo:{
+	  	name:"",
+	  	obituaryOrderNumber:"",
+	  },
+	  bspersonshow:false,
+	  bspersonlist:[],
+	  bspersoncolumns:[],
+	  
+	  // 数量
+	  number:1,
+    };
+  },
+	onPageScroll(e) {this.$refs.nv.pageScroll(e)},
+	computed:{
+		pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
+	},
+	onLoad(item) {
+		this.info = JSON.parse(item.info)
+		console.log(this.info);
+		this.getbsinfo();
+	},
+  methods: {
+	  // 获取用户的报丧记录
+	  getbsinfo(){
+	  	console.log("userinfo",uni.getStorageSync("USERS_KEY"));
+	  	var info = {
+	  		userId:uni.getStorageSync("USERS_KEY").userId
+	  	}
+	  	this.API.getbsinfo(info).then(res=>{
+	  		console.log("获取用户报丧信息",res);
+	  		this.bzpersonlist = res.rows;
+	  		this.bspersoninfo.name = res.rows[0].deceasedName
+	  		this.bspersoninfo.obituaryOrderNumber = res.rows[0].orderNumber
+	  		var info = []
+	  		for(let i = 0;i < res.rows.length;i++){
+	  			info.push(res.rows[i].deceasedName)
+	  		}
+	  		this.bspersoncolumns.push(info)
+	  	})
+	  },
+	  // 报丧人确定
+	  bspersonconfirm(e){
+	  	this.bspersonshow = false
+	  	this.bspersoninfo.name = e.value[0]
+	  	this.bspersoninfo.obituaryOrderNumber = this.bspersonlist[e.indexs[0]].orderNumber
+	  },
+	  bspersonclose(){
+	  	this.bspersonshow = false
+	  },
+	  addproduct(){
+		  console.log(uni.getStorageSync('USERS_KEY'));
+		  var info = {
+			userId:0,
+			productId:"",
+			productTotal:this.number,
+			orderNumber:"",
+		  }
+		  info.userId = uni.getStorageSync('USERS_KEY').userId;
+		  info.productId = this.info.productId;
+		  info.orderNumber = this.bspersoninfo.obituaryOrderNumber
+		  console.log("提交数据",info);
+		  // return
+		  this.API.addproduct(info).then(res=>{
+			  console.log("商品订单",res);
+			  if(res.code == 200){
+				  this.$refs.uToast.show({
+				  	type: 'success',
+				  	title: '成功主题(带图标)',
+				  	message: "购买成功",
+				  	iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
+				  })
+				  setTimeout(function () {
+				      uni.navigateBack({
+				          delta: 1
+				      });
+				  }, 2000);
+			  }
+		  })
+	  },
+  }
+};
+</script>
+
+<style scoped lang="scss">
+@import 'mallgoods.scss';
+.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: rgb(84, 125, 255);
+		border-radius: 50%;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
+</style>
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 2b4f6b8..c3b4578 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -107,7 +107,7 @@
 		},
 		data() {
 			return {
-				Baseapi:"http://8.130.38.56:2015",
+				Baseapi:"http://zhmz.rsxmzj.cn:8536",
 				nvConfig:{
 					title:"殡葬公共服务",
 					bgColor:"#ffffff",
diff --git a/pages/myorder/myorder.vue b/pages/myorder/myorder.vue
index 82e69fb..7d24d55 100644
--- a/pages/myorder/myorder.vue
+++ b/pages/myorder/myorder.vue
@@ -1,200 +1,200 @@
-<template>
-	<view class="page">
-		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
-		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
-		<view class="content">
-		<!-- 订单tab -->
-		<view class="order-tab">
-			<view class="tab" :class="{'action':OrderType==0}" @click="onOrderTab(0)">
-				<text>全部</text>
-				<text class="line"></text>
-			</view>
-			<view class="tab" :class="{'action':OrderType==1}" @click="onOrderTab(1)">
-				<text>待付款</text>
-				<text class="line"></text>
-			</view>
-			<view class="tab" :class="{'action':OrderType==2}" @click="onOrderTab(2)">
-				<text>已完成</text>
-				<text class="line"></text>
-			</view>
-			<view class="tab" :class="{'action':OrderType==3}" @click="onOrderTab(3)">
-				<text>待评价</text>
-				<text class="line"></text>
-			</view>
-		</view>
-		<!-- 订单列表 -->
-		<view class="order-list">
-			<view class="list" v-for="(item,index) in list" @click="onOrderList" :key="index">
-				<view class="title-status">
-					<view class="title">
-						<text>订单号：{{item.funeralUserOrderInfoPo.orderId}}</text>
-						<!-- <image :src="Baseapi + item.image"></image> -->
-					</view>
-					<view class="status">
-						<text>待付款</text>
-					</view>
-				</view>
-				<view class="goods-list">
-					<view class="goods">
-						<view class="thumb">
-							<image :src="Baseapi + item.orderProductInfoVoList[0].productImage" mode=""></image>
-						</view>
-						<view class="item">
-							<view class="goods-name">
-								<view class="goods-name-title">{{item.orderProductInfoVoList[0].productName}}</view>
-								<view>下单时间：{{item.funeralUserOrderInfoPo.orderPlacedTime}}</view>
-							</view>
-							<view class="goods-price">
-								<view class="min">¥{{item.orderProductInfoVoList[0].totalPrice / item.orderProductInfoVoList[0].quantityNumber}}</view>
-								<view>x{{item.orderProductInfoVoList[0].quantityNumber}}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="status-btn">
-					<view>共{{item.orderProductInfoVoList[0].quantityNumber}}件商品，合计<text class="red">¥</text><text class="red big">{{item.orderProductInfoVoList[0].totalPrice}}</text></view>
-					<view class="btn" @click="myorderdetail(item)">
-						<image src="../../static/btn.png" mode="widthFix"></image>
-						<text>查看详情</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				Baseapi:"http://8.130.38.56:2015",
-				OrderType: 0,
-				nvConfig:{
-					title:"商城订单",
-					bgColor:"#ffffff",
-					color:"#000000",
-					fixedAssist:{
-						hide:true,
-					},
-				},
-				list:[],
-				cxinfo:{
-					pageNum:1,
-					pageSize:10,
-					status:null,
-					customerName:""
-				}
-			};
-		},
-		onPageScroll(e) {this.$refs.nv.pageScroll(e)},
-		computed:{
-			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
-		},
-		onLoad(params) {
-			console.log("111",params);
-			this.OrderType = params.type;
-			this.onOrderTab(params.type);
-			// this.getuserdd();
-		},
-		methods:{
-			myorderdetail(info){
-				info = JSON.stringify(info)
-				uni.navigateTo({
-					url: '/pages/myorderdetail/myorderdetail?info=' + info,
-				})
-			},
-			onOrderTab(e){
-				this.OrderType = e;
-				this.list = []
-				if(e == 0){
-					this.cxinfo.status = ''
-				}
-				if(e == 1){
-					this.cxinfo.status = "待付款"
-				}
-				if(e == 2){
-					this.cxinfo.status = "已完成"
-				}
-				if(e == 3){
-					this.cxinfo.status = "待评价"
-				}
-				var user = uni.getStorageSync('USERS_KEY')
-				this.cxinfo.customerName = user.userName
-				this.cxinfo.userId = user.userId
-				console.log("user",user);
-				this.API.getDdxq(this.cxinfo).then(res=>{
-					console.log(res);
-					this.list = res.data
-				})
-				// this.API.getuserdd(this.cxinfo).then(res=>{
-				// 	console.log("用户订单",res);
-				// 	for(let i = 0;i < res.rows.length;i++){
-				// 		var info = {
-				// 			ddid:"",
-				// 			name:"",
-				// 			time:"",
-				// 			number:"",
-				// 			price:"",
-				// 			image:""
-				// 		}
-				// 		info.ddid = res.rows[i].orderId;
-				// 		info.time = res.rows[i].orderPlacedTime
-				// 		this.API.getuserddxq(res.rows[i].orderId).then(res1=>{
-				// 			console.log("订单详情",res1);
-				// 			info.number = res1.rows[0].quantityNumber
-				// 			info.price = info.number * res1.rows[0].unitPrice
-				// 			this.API.getspjcxx(res1.rows[0].productId).then(res2=>{
-				// 				console.log("产品信息",res2);
-				// 				info.name = res2.rows[0].productName;
-				// 				info.image = res2.rows[0].productImage;
-				// 				this.list.push(info)
-				// 			})
-				// 		})
-				// 		console.log("list",this.list);
-				// 	}
-				// })
-			},
-			// 获取用户订单
-			getuserdd(){
-				this.list = []
-				var is = {
-					userId:uni.getStorageSync("USERS_KEY").userId
-				}
-				this.API.getuserdd(is).then(res=>{
-					console.log("用户订单",res);
-					for(let i = 0;i < res.rows.length;i++){
-						console.log(11111);
-						var info = {
-							ddid:"",
-							name:"",
-							time:"",
-							number:"",
-							price:"",
-							image:""
-						}
-						info.ddid = res.rows[i].orderId;
-						info.time = res.rows[i].orderPlacedTime
-						this.API.getuserddxq(res.rows[i].orderId).then(res1=>{
-							console.log("订单详情",res1);
-							info.number = res1.rows[0].quantityNumber
-							info.price = info.number * res1.rows[0].unitPrice
-							this.API.getspjcxx(res1.rows[0].productId).then(res2=>{
-								console.log("产品信息",res2);
-								info.name = res2.rows[0].productName;
-								info.image = res2.rows[0].productImage;
-							})
-						})
-						this.list.push(info)
-						console.log("订单列表",this.list);
-					}
-				})
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	@import 'myorder.scss';
-</style>
+<template>
+	<view class="page">
+		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
+		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
+		<view class="content">
+		<!-- 订单tab -->
+		<view class="order-tab">
+			<view class="tab" :class="{'action':OrderType==0}" @click="onOrderTab(0)">
+				<text>全部</text>
+				<text class="line"></text>
+			</view>
+			<view class="tab" :class="{'action':OrderType==1}" @click="onOrderTab(1)">
+				<text>待付款</text>
+				<text class="line"></text>
+			</view>
+			<view class="tab" :class="{'action':OrderType==2}" @click="onOrderTab(2)">
+				<text>已完成</text>
+				<text class="line"></text>
+			</view>
+			<view class="tab" :class="{'action':OrderType==3}" @click="onOrderTab(3)">
+				<text>待评价</text>
+				<text class="line"></text>
+			</view>
+		</view>
+		<!-- 订单列表 -->
+		<view class="order-list">
+			<view class="list" v-for="(item,index) in list" @click="onOrderList" :key="index">
+				<view class="title-status">
+					<view class="title">
+						<text>订单号：{{item.funeralUserOrderInfoPo.orderId}}</text>
+						<!-- <image :src="Baseapi + item.image"></image> -->
+					</view>
+					<view class="status">
+						<text>待付款</text>
+					</view>
+				</view>
+				<view class="goods-list">
+					<view class="goods">
+						<view class="thumb">
+							<image :src="Baseapi + item.orderProductInfoVoList[0].productImage" mode=""></image>
+						</view>
+						<view class="item">
+							<view class="goods-name">
+								<view class="goods-name-title">{{item.orderProductInfoVoList[0].productName}}</view>
+								<view>下单时间：{{item.funeralUserOrderInfoPo.orderPlacedTime}}</view>
+							</view>
+							<view class="goods-price">
+								<view class="min">¥{{item.orderProductInfoVoList[0].totalPrice / item.orderProductInfoVoList[0].quantityNumber}}</view>
+								<view>x{{item.orderProductInfoVoList[0].quantityNumber}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="status-btn">
+					<view>共{{item.orderProductInfoVoList[0].quantityNumber}}件商品，合计<text class="red">¥</text><text class="red big">{{item.orderProductInfoVoList[0].totalPrice}}</text></view>
+					<view class="btn" @click="myorderdetail(item)">
+						<image src="../../static/btn.png" mode="widthFix"></image>
+						<text>查看详情</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				Baseapi:"http://zhmz.rsxmzj.cn:8536",
+				OrderType: 0,
+				nvConfig:{
+					title:"商城订单",
+					bgColor:"#ffffff",
+					color:"#000000",
+					fixedAssist:{
+						hide:true,
+					},
+				},
+				list:[],
+				cxinfo:{
+					pageNum:1,
+					pageSize:10,
+					status:null,
+					customerName:""
+				}
+			};
+		},
+		onPageScroll(e) {this.$refs.nv.pageScroll(e)},
+		computed:{
+			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
+		},
+		onLoad(params) {
+			console.log("111",params);
+			this.OrderType = params.type;
+			this.onOrderTab(params.type);
+			// this.getuserdd();
+		},
+		methods:{
+			myorderdetail(info){
+				info = JSON.stringify(info)
+				uni.navigateTo({
+					url: '/pages/myorderdetail/myorderdetail?info=' + info,
+				})
+			},
+			onOrderTab(e){
+				this.OrderType = e;
+				this.list = []
+				if(e == 0){
+					this.cxinfo.status = ''
+				}
+				if(e == 1){
+					this.cxinfo.status = "待付款"
+				}
+				if(e == 2){
+					this.cxinfo.status = "已完成"
+				}
+				if(e == 3){
+					this.cxinfo.status = "待评价"
+				}
+				var user = uni.getStorageSync('USERS_KEY')
+				this.cxinfo.customerName = user.userName
+				this.cxinfo.userId = user.userId
+				console.log("user",user);
+				this.API.getDdxq(this.cxinfo).then(res=>{
+					console.log(res);
+					this.list = res.data
+				})
+				// this.API.getuserdd(this.cxinfo).then(res=>{
+				// 	console.log("用户订单",res);
+				// 	for(let i = 0;i < res.rows.length;i++){
+				// 		var info = {
+				// 			ddid:"",
+				// 			name:"",
+				// 			time:"",
+				// 			number:"",
+				// 			price:"",
+				// 			image:""
+				// 		}
+				// 		info.ddid = res.rows[i].orderId;
+				// 		info.time = res.rows[i].orderPlacedTime
+				// 		this.API.getuserddxq(res.rows[i].orderId).then(res1=>{
+				// 			console.log("订单详情",res1);
+				// 			info.number = res1.rows[0].quantityNumber
+				// 			info.price = info.number * res1.rows[0].unitPrice
+				// 			this.API.getspjcxx(res1.rows[0].productId).then(res2=>{
+				// 				console.log("产品信息",res2);
+				// 				info.name = res2.rows[0].productName;
+				// 				info.image = res2.rows[0].productImage;
+				// 				this.list.push(info)
+				// 			})
+				// 		})
+				// 		console.log("list",this.list);
+				// 	}
+				// })
+			},
+			// 获取用户订单
+			getuserdd(){
+				this.list = []
+				var is = {
+					userId:uni.getStorageSync("USERS_KEY").userId
+				}
+				this.API.getuserdd(is).then(res=>{
+					console.log("用户订单",res);
+					for(let i = 0;i < res.rows.length;i++){
+						console.log(11111);
+						var info = {
+							ddid:"",
+							name:"",
+							time:"",
+							number:"",
+							price:"",
+							image:""
+						}
+						info.ddid = res.rows[i].orderId;
+						info.time = res.rows[i].orderPlacedTime
+						this.API.getuserddxq(res.rows[i].orderId).then(res1=>{
+							console.log("订单详情",res1);
+							info.number = res1.rows[0].quantityNumber
+							info.price = info.number * res1.rows[0].unitPrice
+							this.API.getspjcxx(res1.rows[0].productId).then(res2=>{
+								console.log("产品信息",res2);
+								info.name = res2.rows[0].productName;
+								info.image = res2.rows[0].productImage;
+							})
+						})
+						this.list.push(info)
+						console.log("订单列表",this.list);
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'myorder.scss';
+</style>
diff --git a/pages/myorderdetail/myorderdetail.vue b/pages/myorderdetail/myorderdetail.vue
index 4436059..008d3ba 100644
--- a/pages/myorderdetail/myorderdetail.vue
+++ b/pages/myorderdetail/myorderdetail.vue
@@ -1,142 +1,142 @@
-<template>
-	<view class="page">
-		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
-		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
-		<view class="content">
-			
-			<view class="message-list">
-			<view class="titleall-box">
-				<view class="titleall-left"><view class="titleall-left-line"></view>商品信息</view>
-			</view>
-			<view class="info-box">
-				<view class="goods-list">
-					<view class="goods">
-						<view class="thumb">
-							<image :src="Baseapi + info.orderProductInfoVoList[0].productImage" mode=""></image>
-						</view>
-						<view class="item">
-							<view class="goods-name">
-								<view class="goods-name-title">{{info.orderProductInfoVoList[0].productName}}</view>
-								<view>下单时间：{{info.funeralUserOrderInfoPo.orderPlacedTime}}</view>
-							</view>
-							<view class="goods-price">
-								<view class="min">¥{{info.orderProductInfoVoList[0].totalPrice / info.orderProductInfoVoList[0].quantityNumber}}</view>
-								<view>x{{info.orderProductInfoVoList[0].quantityNumber}}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			</view>
-			
-			<view class="message-list">
-			<view class="titleall-box">
-				<view class="titleall-left"><view class="titleall-left-line"></view>费用信息</view>
-			</view>
-			<view class="info-box">
-				<view class="info-box-list">
-					<view class="serve">
-						<view class="serve-title" style="font-weight: 500;color: #a8a8a8;">商品总额：</view>
-						<view class="serve-right">
-							<view class="serve-right-top">¥{{info.orderProductInfoVoList[0].totalPrice}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="info-box-list">
-					<view class="serve">
-						<view class="serve-title">应付款：</view>
-						<view class="serve-right">
-							<view class="serve-right-top" style="font-weight: bold;color: #3d3d3d;">¥{{info.orderProductInfoVoList[0].totalPrice}}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			</view>
-			
-			<view class="message-list">
-			<view class="titleall-box">
-				<view class="titleall-left"><view class="titleall-left-line"></view>订单信息</view>
-			</view>
-			<view class="info-box">
-				<view class="info-box-list">
-					<view class="serve">
-						<view class="serve-title">订单编号：</view>
-						<view class="serve-right">
-							<view class="serve-right-top">{{info.funeralUserOrderInfoPo.orderId}}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			</view>
-			
-		</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				Baseapi:"http://8.130.38.56:2015",
-				OrderType: 0,
-				nvConfig:{
-					title:"商品订单详情",
-					bgColor:"#ffffff",
-					color:"#000000",
-					fixedAssist:{
-						hide:true,
-					},
-				},
-				info:{}
-			};
-		},
-		onPageScroll(e) {this.$refs.nv.pageScroll(e)},
-		computed:{
-			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
-		},
-		onLoad(params) {
-			this.info = JSON.parse(params.info)
-			console.log(this.info);
-		},
-		methods:{
-			/**
-			 * 返回点击
-			 */
-			onBack(){
-				uni.navigateBack();
-			},
-			/**
-			 * 订单tab点击
-			 */
-			onOrderTab(type){
-				this.OrderType = type;
-				// #ifdef H5
-				uni.redirectTo({
-					url: '/pages/MyOrderList/MyOrderList?type=' + type,
-				})
-				//#endif
-			},
-			/**
-			 * 订单列表点击
-			 */
-			onOrderList(){
-				uni.navigateTo({
-					url: '/pages/OrderDetails/OrderDetails',
-				})
-			},
-      /**
-       * 评价点击
-       */
-      onEvaluate(){
-			  uni.navigateTo({
-          url: '/pages/MyEvaluatePush/MyEvaluatePush'
-        })
-      }
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	@import 'myorderdetail.scss';
-</style>
+<template>
+	<view class="page">
+		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
+		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
+		<view class="content">
+			
+			<view class="message-list">
+			<view class="titleall-box">
+				<view class="titleall-left"><view class="titleall-left-line"></view>商品信息</view>
+			</view>
+			<view class="info-box">
+				<view class="goods-list">
+					<view class="goods">
+						<view class="thumb">
+							<image :src="Baseapi + info.orderProductInfoVoList[0].productImage" mode=""></image>
+						</view>
+						<view class="item">
+							<view class="goods-name">
+								<view class="goods-name-title">{{info.orderProductInfoVoList[0].productName}}</view>
+								<view>下单时间：{{info.funeralUserOrderInfoPo.orderPlacedTime}}</view>
+							</view>
+							<view class="goods-price">
+								<view class="min">¥{{info.orderProductInfoVoList[0].totalPrice / info.orderProductInfoVoList[0].quantityNumber}}</view>
+								<view>x{{info.orderProductInfoVoList[0].quantityNumber}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			</view>
+			
+			<view class="message-list">
+			<view class="titleall-box">
+				<view class="titleall-left"><view class="titleall-left-line"></view>费用信息</view>
+			</view>
+			<view class="info-box">
+				<view class="info-box-list">
+					<view class="serve">
+						<view class="serve-title" style="font-weight: 500;color: #a8a8a8;">商品总额：</view>
+						<view class="serve-right">
+							<view class="serve-right-top">¥{{info.orderProductInfoVoList[0].totalPrice}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="info-box-list">
+					<view class="serve">
+						<view class="serve-title">应付款：</view>
+						<view class="serve-right">
+							<view class="serve-right-top" style="font-weight: bold;color: #3d3d3d;">¥{{info.orderProductInfoVoList[0].totalPrice}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			</view>
+			
+			<view class="message-list">
+			<view class="titleall-box">
+				<view class="titleall-left"><view class="titleall-left-line"></view>订单信息</view>
+			</view>
+			<view class="info-box">
+				<view class="info-box-list">
+					<view class="serve">
+						<view class="serve-title">订单编号：</view>
+						<view class="serve-right">
+							<view class="serve-right-top">{{info.funeralUserOrderInfoPo.orderId}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			</view>
+			
+		</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				Baseapi:"http://zhmz.rsxmzj.cn:8536",
+				OrderType: 0,
+				nvConfig:{
+					title:"商品订单详情",
+					bgColor:"#ffffff",
+					color:"#000000",
+					fixedAssist:{
+						hide:true,
+					},
+				},
+				info:{}
+			};
+		},
+		onPageScroll(e) {this.$refs.nv.pageScroll(e)},
+		computed:{
+			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
+		},
+		onLoad(params) {
+			this.info = JSON.parse(params.info)
+			console.log(this.info);
+		},
+		methods:{
+			/**
+			 * 返回点击
+			 */
+			onBack(){
+				uni.navigateBack();
+			},
+			/**
+			 * 订单tab点击
+			 */
+			onOrderTab(type){
+				this.OrderType = type;
+				// #ifdef H5
+				uni.redirectTo({
+					url: '/pages/MyOrderList/MyOrderList?type=' + type,
+				})
+				//#endif
+			},
+			/**
+			 * 订单列表点击
+			 */
+			onOrderList(){
+				uni.navigateTo({
+					url: '/pages/OrderDetails/OrderDetails',
+				})
+			},
+      /**
+       * 评价点击
+       */
+      onEvaluate(){
+			  uni.navigateTo({
+          url: '/pages/MyEvaluatePush/MyEvaluatePush'
+        })
+      }
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'myorderdetail.scss';
+</style>
diff --git a/pages/xxdetail/xxdetail.vue b/pages/xxdetail/xxdetail.vue
index b92f6e5..578b226 100644
--- a/pages/xxdetail/xxdetail.vue
+++ b/pages/xxdetail/xxdetail.vue
@@ -1,89 +1,89 @@
-<template>
-	<view class="page">
-		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
-		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
-		<view class="content" style="padding: 20rpx;background-color: #fff;">
-			<view class="title">
-				<span style="margin-right: 10rpx;">标题:</span>
-				<span>{{info.title}}</span>
-			</view>
-			<view class="main">
-				<image v-if="info.coverImage != null" :src="Baseapi + info.coverImage" style="width: 100%;" mode="widthFix"></image>
-				<view class="main_footer">
-					<view class="left">
-						<span class="f1">发布人: {{info.publisherName}}</span>
-					</view>
-					<view class="right">
-						<span class="f1">发布时间: {{info.publishTime}}</span>
-					</view>
-				</view>
-			</view>
-			<view class="content" v-html="info.content">
-				
-			</view>
-		</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				Baseapi:"http://8.130.38.56:2015",
-				nvConfig:{
-					title:"殡葬普法宣传",
-					bgColor:"#ffffff",
-					color:"#000000",
-					fixedAssist:{
-						hide:true,
-					},
-				},
-				list:[],
-				info:{}
-			};
-		},
-		onPageScroll(e) {this.$refs.nv.pageScroll(e)},
-		computed:{
-			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
-		},
-		onLoad(item) {
-			console.log("res",item);
-
-			this.gain(item.info)
-			// this.info = JSON.parse(item.info)
-			// this.nvConfig.title = this.info.title + "详情页"
-		},
-		methods: {
-			gain(e) {
-				this.API.getfbgldata(e).then(res => {
-					console.log(res);
-					this.info = res.data
-					// this.info = JSON.parse(item.info)
-					this.nvConfig.title = this.info.title + "详情页"
-				})
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	@import 'xxdetail.scss';
-	.title{
-		padding: 20rpx;
-	}
-	.main{
-		padding: 20rpx;
-		.main_footer{
-			display: flex;
-			justify-content: space-between;
-			margin-top: 10rpx;
-			.f1{
-				color: #c2c2c2;
-			}
-		}
-	}
-	.content{
-		padding: 20rpx;
-	}
-</style>
+<template>
+	<view class="page">
+		<pyh-nv ref="nv" :config="nvConfig"></pyh-nv>
+		<view class="listBox" :style="{'padding-top':(pageTop+'px')}">
+		<view class="content" style="padding: 20rpx;background-color: #fff;">
+			<view class="title">
+				<span style="margin-right: 10rpx;">标题:</span>
+				<span>{{info.title}}</span>
+			</view>
+			<view class="main">
+				<image v-if="info.coverImage != null" :src="Baseapi + info.coverImage" style="width: 100%;" mode="widthFix"></image>
+				<view class="main_footer">
+					<view class="left">
+						<span class="f1">发布人: {{info.publisherName}}</span>
+					</view>
+					<view class="right">
+						<span class="f1">发布时间: {{info.publishTime}}</span>
+					</view>
+				</view>
+			</view>
+			<view class="content" v-html="info.content">
+				
+			</view>
+		</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				Baseapi:"http://zhmz.rsxmzj.cn:8536",
+				nvConfig:{
+					title:"殡葬普法宣传",
+					bgColor:"#ffffff",
+					color:"#000000",
+					fixedAssist:{
+						hide:true,
+					},
+				},
+				list:[],
+				info:{}
+			};
+		},
+		onPageScroll(e) {this.$refs.nv.pageScroll(e)},
+		computed:{
+			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
+		},
+		onLoad(item) {
+			console.log("res",item);
+
+			this.gain(item.info)
+			// this.info = JSON.parse(item.info)
+			// this.nvConfig.title = this.info.title + "详情页"
+		},
+		methods: {
+			gain(e) {
+				this.API.getfbgldata(e).then(res => {
+					console.log(res);
+					this.info = res.data
+					// this.info = JSON.parse(item.info)
+					this.nvConfig.title = this.info.title + "详情页"
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import 'xxdetail.scss';
+	.title{
+		padding: 20rpx;
+	}
+	.main{
+		padding: 20rpx;
+		.main_footer{
+			display: flex;
+			justify-content: space-between;
+			margin-top: 10rpx;
+			.f1{
+				color: #c2c2c2;
+			}
+		}
+	}
+	.content{
+		padding: 20rpx;
+	}
+</style>