修复bug

App.vue

@@ -37,7 +37,7 @@
 
 		},
 		onHide: function() {
-			console.log('App Hide')
+			console.log('小程序销毁触发')
 		},
 		globalData : {
 		    imService : null

common/authorize.js

@@ -1,4 +1,5 @@
 var utilMd5 = require('./md5.js');
+// const tx_key = 'XSWBZ-TBVWD-QJ54G-HGYZW-5AWQK-M2FYS'
 const tx_key = 'H3TBZ-Y5VW5-RQEIS-QZPN2-7DLA5-4OBMG'; // 腾讯地图key
 const tx_secret_key = ''; // key对应的签名
 

common/env.js

@@ -1,3 +1,5 @@
-export const envHost = 'https://t5.9026.com'; //开发环境
-//export const imgHost='https://www.juyinzhengxin.com/';
-export const imgHost = 'https://t5.9026.com/upload/';
+// export const envHost = 'https://t5.9026.com'; //开发环境
+export const envHost = 'https://wechat.fresherbaby.com'
+// export const imgHost='https://www.juyinzhengxin.com/';
+// export const imgHost = 'https://t5.9026.com/upload/';
+export const imgHost = 'https://wechat.fresherbaby.com/upload/'

pages/archives/add_archives.vue

@@ -30,7 +30,7 @@
 				<view class="title">出生医院:</view>
 				<input v-model="birthhospital" placeholder-style="text-align:right" style="text-align: right;" placeholder="请输入出生医院"></input>
 			</view> -->
-			<view class="cu-form-group">
+			<view class="cu-form-group" @click="loncationTap">
 				<view class="title">地址:</view>
 				<input v-model="address" placeholder-style="text-align:right" :disabled="true" style="text-align: right;"></input>
 				<u-icon name="map-fill" color="#2979ff" size="32"></u-icon>
@@ -90,6 +90,9 @@
 </template>
 
 <script>
+	import {
+		getLocation
+	} from "../../common/authorize.js"
 	export default {
 		onLoad(options) {
 			let date = new Date();
@@ -104,6 +107,7 @@
 				uni.setNavigationBarTitle({
 					title: "修改档案"
 				})
+				this.isaddress = false
 				this.name = this.info.name
 				this.imgList = [this.info.avatar]
 				this.touxiang = this.info.avatar
@@ -116,9 +120,11 @@
 				this.phone = this.info.phone
 				this.email = this.info.email
 				// this.birthhospital = this.info.born_hospital
-				this.address = this.info.address
+				this.address = this.info.address.split(' ')[0]
+				this.infoaddress = this.info.address.split(' ')[1]
 				this.social = this.info.social_card_number
 			}
+			this.GetCurrentAddress()
 		},
 		onShow() {
 
@@ -176,7 +182,10 @@
 				touxiang: "",
 				time: "",
 				info: "",
-				social: "" //社保卡号
+				social: "", //社保卡号
+				isaddress: true,
+				latitude: 0,
+				longitude: 0
 			}
 		},
 		methods: {
@@ -234,6 +243,36 @@
 					}
 				});
 			},
+			loncationTap() {
+				uni.chooseLocation({
+					latitude: this.latitude,
+					longitude: this.longitude,
+					success: (res) => {
+						console.log(res)
+						if (res.name !== "" || res.address !== "") {
+							this.address = res.address
+							this.latitude = res.latitude
+							this.longitude = res.longitude
+						} else {
+							uni.showToast({
+								title: "请选择位置",
+								icon: "none"
+							})
+							return false
+						}
+					}
+				})
+			},
+			GetCurrentAddress() {
+				if (this.isaddress) {
+					getLocation().then(res => {
+						this.address = res.address.address
+						this.latitude = res.latitude
+						this.longitude = res.longitude
+						console.log(res)
+					}).catch(res => {})
+				}
+			},
 			// 选中任一radio时，由radio-group触发
 			radioGroupChange(e) {
 				this.value = e
@@ -328,7 +367,7 @@
 					email: this.email,
 					phone: this.phone,
 					guardian_name: this.jianhuname,
-					address: this.address,
+					address: this.address + " " + this.infoaddress,
 					// born_hospital: this.birthhospital,
 					social_card_number: this.social
 				})
@@ -433,7 +472,7 @@
 					email: this.email,
 					phone: this.phone,
 					guardian_name: this.jianhuname,
-					address: this.address,
+					address: this.address + " " + this.infoaddress,
 					// born_hospital: this.birthhospital,
 					social_card_number: this.social
 				})

pages/common_tools/help_feedback/help_feedback.vue

@@ -8,7 +8,8 @@
 		<view class="list">
 			<u-collapse>
 				<u-collapse-item :title="item.title" v-for="(item, index) in itemList" :key="index" head-style="font-size: 28rpx;">
-					<div class="body">{{item.content}}</div>
+					<!-- <div class="body">{{}}</div> -->
+					<rich-text :nodes="item.content"></rich-text>
 				</u-collapse-item>
 			</u-collapse>
 		</view>

pages/common_tools/my_consulting/appointmentInfo.vue

@@ -55,6 +55,8 @@
 						<text v-else-if="orderInfo.order_status==3" class="font_style" style="color: rgb(238, 170, 63);">进行中</text>
 						<text v-else-if="orderInfo.order_status==4" class="font_style" style="color: rgb(238, 170, 63);">已完成</text>
 						<text v-else-if="orderInfo.order_status==5" class="font_style" style="color: rgb(238, 170, 63);">已取消</text>
+						<text v-else-if="orderInfo.order_status==6" class="font_style" style="color: rgb(238, 170, 63);">已超时</text>
+						<text v-else-if="orderInfo.order_status==7" class="font_style" style="color: rgb(238, 170, 63);">已预约</text>
 					</view>
 					<view class="text-gray margin-top-xs padding-tb-xs">
 						<text class="text-leftstyle">下单时间：</text><text class="font_style">{{orderInfo.created_at}}</text>

pages/common_tools/my_consulting/my_appointment.vue

@@ -14,7 +14,9 @@
 						<text v-else-if="item.order_status==1">未支付</text>
 						<text v-else-if="item.order_status==2">待接单</text>
 						<text v-else-if="item.order_status==4">已完成</text>
-						<text v-else>已取消</text>
+						<text v-else-if="item.order_status==5">已取消</text>
+						<text v-else-if="item.order_status==6">已超时</text>
+						<text v-else-if="item.order_status==7">已预约</text>
 					</view>
 					<text class="phonezi" v-if="item.product_type==3">门诊预约</text>
 					<text class="phonezi" v-else-if="item.product_type==4">计免预约</text>
@@ -49,8 +51,8 @@
 					<view class="textstyle margin-top-xs">
 						<text style="color: #333333;">预约时间：{{format(item.order_patient.appoint_start_time*1000)+'至'+format(item.order_patient.appoint_end_time*1000)}}</text>
 					</view>
-					<view class="cu-bar bg-white tabbar" v-if="item.order_status==1||item.order_status==2||item.order_status==3" style="width: 100%;display: flex;justify-content: flex-end;">
-						<u-button shape="circle" size="mini" @click="cancelOrder(item)" :ripple="true">取消订单</u-button>
+					<view class="cu-bar bg-white tabbar" v-if="item.order_status==1||item.order_status==2||item.order_status==7" style="width: 100%;display: flex;justify-content: flex-end;">
+						<u-button shape="circle" size="mini" @click="cancelOrder(item,index)" :ripple="true">取消订单</u-button>
 					</view>
 				</view>
 			</view>
@@ -141,11 +143,26 @@
 			uni.stopPullDownRefresh()
 		},
 		methods: {
-			cancelOrder: async function(item) {
+			cancelOrder: async function(item, index) {
 				let res = await this.$request.post("/api/v1/order/orderCancel", {
 					order_id: item.id
 				})
-				console.log(res)
+				if (res.status == 0) {
+					uni.showToast({
+						title: "取消成功",
+						icon: "none"
+					})
+					this.ordersList.splice(index, 1)
+				}else{
+					uni.showModal({
+						title:"提示",
+						content:res.message,
+						showCancel:false,
+						success: (res) => {
+							
+						}
+					})
+				}
 			},
 			gotoinfo(item) {
 				uni.navigateTo({

pages/common_tools/my_consulting/my_consulting.vue

@@ -8,7 +8,7 @@
 		<load-refresh ref="loadRefresh" :isRefresh="true" refreshType="loader" refreshTime="2000" heightReduce="10"
 		 backgroundCover="#fff" :pageNo="pageindex" :totalPageNo="totalPage" @loadMore="loadMore" @refresh="refresh">
 			<view slot="content-list">
-				<view class="margin-top-sm margin-lr-sm" v-for="(item,index) in ordersList" @click="goinfoorder" :data-id="item.id"
+				<view class="margin-top-sm margin-lr-sm padding-lr-xs" v-for="(item,index) in ordersList" @click="goinfoorder" :data-id="item.id"
 				 :key="index" style="border-radius: 16rpx;box-shadow:0px 0px 10px rgba(0,0,0,.2);">
 					<view class="flex justify-between align-center bg-white" style="padding: 28rpx;border-radius: 16rpx;">
 						<view class="jinxing">
@@ -17,7 +17,8 @@
 							<text v-else-if="item.order_status==1">未支付</text>
 							<text v-else-if="item.order_status==2">待接单</text>
 							<text v-else-if="item.order_status==4">已完成</text>
-							<text v-else>已取消</text>
+							<text v-else-if="item.order_status==5">已取消</text>
+							<text v-else-if="item.order_status==6">已超时</text>
 						</view>
 						<text class="phonezi" v-if="item.product_type==1">电话咨询</text>
 						<text class="phonezi" v-else-if="item.product_type==2">图文咨询</text>
@@ -45,6 +46,9 @@
 							<text style="color: #333333;">下单时间：{{item.created_at}}</text>
 						</view>
 					</view>
+					<view class="cu-bar bg-white tabbar" v-if="item.order_status==1||item.order_status==2" style="width: 100%;display: flex;justify-content: flex-end;">
+						<u-button shape="circle" size="mini" @click="cancelOrder(item,index)" :ripple="true">取消订单</u-button>
+					</view>
 				</view>
 			</view>
 		</load-refresh>
@@ -212,6 +216,27 @@
 		// 	uni.stopPullDownRefresh()
 		// },
 		methods: {
+			cancelOrder: async function(item, index) {
+				let res = await this.$request.post("/api/v1/order/orderCancel", {
+					order_id: item.id
+				})
+				if (res.status == 0) {
+					uni.showToast({
+						title: "取消成功",
+						icon: "none"
+					})
+					this.ordersList.splice(index, 1)
+				}else{
+					uni.showModal({
+						title:"提示",
+						content:res.message,
+						showCancel:false,
+						success: (res) => {
+							
+						}
+					})
+				}
+			},
 			loadMore() {
 				this.getordersList()
 			},

pages/doctor_related/info_write.vue

@@ -78,10 +78,13 @@
 					<text class="text-grey">症状描述</text>
 				</view>
 				<view class="action">
-					<!-- <text class="text-grey text-sm">查看范例</text> -->
+					<text class="text-blue text-sm" @click="isdescribe = !isdescribe">如何描述？</text>
 				</view>
 			</view>
-			<textarea v-if="type==2" v-model="zhengzhuang" value="" class="textareasty" placeholder="请填写您的病症描述" />
+			<view class="text-gray text-sm" style="margin: 25rpx 37rpx;line-height: 38rpx;" v-show="isdescribe">
+				例：宝宝18个月，脸上长了密密麻麻的疹子，如图。大概有一个星期了，孩子也不挠。每天清洗，涂了一些炉甘石洗剂，未见效，请问医生这是怎么回事？
+			</view>
+			<textarea v-if="type==2" v-model="zhengzhuang" value="" class="textareasty" placeholder="请描述你的疾病或症状、是否用药、需要我提供什么样的帮助." />
 			</view>
 			<view class="" v-if="type==2">
 				<view class="cu-bar bg-white margin-top">
@@ -244,7 +247,8 @@
 				jigouid:"",
 				year:"",
 				yearid:"",
-				upimg:[]
+				upimg:[],
+				isdescribe:false,
 			}
 		},
 		methods: {

pages/index/index.vue

@@ -2,7 +2,7 @@
 	<view class="main">
 		<view class="">
 			<u-search :clearabled="true" shape="round" search-icon-color="#EEAA3F" @custom="searchvalue" :show-action="true"
-			 placeholder="搜索医生姓名、医院名" v-model="keyword"></u-search>
+			 placeholder="搜索医生、医院、服务包" v-model="keyword"></u-search>
 		</view>
 		<view class="margin-top-sm margin-bottom-sm">
 			<official-account></official-account>

pages/index/mine.vue

@@ -37,30 +37,30 @@
 			</view>
 			<view class="fb f18 plr20">我的订单</view>
 			<view class="margin-lr-sm m-dpflex m-justify-start m-align-center overflow bg-white margin-top-sm" style="padding-top: 40rpx;padding-bottom: 40rpx;border-radius: 16rpx;box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);">
-				<navigator class="width25 m-ycenter overflow pr" hoverClass="none" url="../common_tools/my_consulting/my_consulting">
-					<image style="width: 76rpx;height: 76rpx;" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/myzixun.png"
-					 mode=""></image>
+				<navigator class="width25 m-ycenter overflow pr" v-for="(item,index) in icons" :key="index" hoverClass="none"
+				 @click="gotoinfoorder(item.name)">
+					<image style="width: 76rpx;height: 76rpx;" :src="item.image" mode=""></image>
 					<!-- <view class="tip"></view> -->
-					<view class="f14 m-gray-small mt10 line1">我的咨询</view>
+					<view class="f14 m-gray-small mt10 line1">{{item.name}}</view>
 				</navigator>
-				<navigator class="width25 m-ycenter overflow pr" hoverClass="none" url="../common_tools/my_consulting/my_appointment">
+				<!-- <navigator class="width25 m-ycenter overflow pr" hoverClass="none" url="../common_tools/my_consulting/my_appointment">
 					<image style="width: 76rpx;height: 76rpx;" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/myyuyue.png"
 					 mode=""></image>
-					<!-- <view class="tip"></view> -->
+					<view class="tip"></view>
 					<view class="f14 m-gray-small mt10 line1">我的预约</view>
 				</navigator>
 				<navigator class="width25 m-ycenter overflow pr" hoverClass="none" url="../common_tools/my_consulting/my_opinion">
 					<image style="width: 76rpx;height: 76rpx;" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/myyijian.png"
 					 mode=""></image>
-					<!-- <view class="tip"></view> -->
+					<view class="tip"></view>
 					<view class="f14 m-gray-small mt10 line1">我的意见单</view>
 				</navigator>
 				<navigator class="width25 m-ycenter overflow pr" hoverClass="none" url="../service_box/box_details">
 					<image style="width: 76rpx;height: 76rpx;" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/myservice.png"
 					 mode=""></image>
-					<!-- <view class="tip"></view> -->
+					<view class="tip"></view>
 					<view class="f14 m-gray-small mt10 line1">服务包订单</view>
-				</navigator>
+				</navigator> -->
 			</view>
 			<navigator class="pr m-xcenter plr20 pt20" hoverClass="none" url="../archives/my_archives">
 				<view class="fb f18 pr m-flex tl">健康档案</view>
@@ -141,6 +141,10 @@
 					</view>
 				</view>
 			</view>
+			<view class="footer">
+				<image style="width: 200rpx;height: 72rpx;" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/logo.png" mode=""></image>
+				<text style="font-size: 24rpx;color: rgba(0,0,0,.3);margin-top: 15rpx;">宝宝少生病 / 妈妈更省心 / 家人更安心</text>
+			</view>
 		</view>
 		<view class="cu-tabbar-height"></view>
 		<view class="cu-tabbar-height"></view>
@@ -154,7 +158,7 @@
 	import store from '@/store'
 	export default {
 		onLoad(options) {
-
+			this.getindexImg()
 		},
 		onShow() {
 			this.getUserInfo()
@@ -199,10 +203,46 @@
 					conversations: []
 				},
 				imService: null,
-				mseeage: ""
+				mseeage: "",
+				icons: []
 			}
 		},
 		methods: {
+			getindexImg: async function() {
+				let res = await this.$request.post("/api/v1/common/icons", {
+					type: 3
+				})
+				if (res.status == 200) {
+					this.icons = res.data
+					console.log(this.icons, ">>>>>>>>>>>>>>>>>>>>")
+				}
+			},
+			gotoinfoorder(name) {
+				switch (name) {
+					case "我的咨询":
+						uni.navigateTo({
+							url: "../common_tools/my_consulting/my_consulting"
+						})
+						break;
+					case "我的预约":
+						uni.navigateTo({
+							url: "../common_tools/my_consulting/my_appointment"
+						})
+						break;
+					case "我的意见单":
+						uni.navigateTo({
+							url: "../common_tools/my_consulting/my_opinion"
+						})
+						break;
+					case "服务包订单":
+						uni.navigateTo({
+							url: "../service_box/box_details"
+						})
+						break;
+					default:
+						break;
+				}
+			},
 			setUnreadAmount() {
 				if (this.conversations.unreadTotal > 0) {
 					this.mseeage = this.conversations.unreadTotal.toString()
@@ -280,7 +320,18 @@
 
 <style scoped>
 	@import url("./mine.css");
-
+	.footer{
+		text-align: center;
+		padding-top: 15rpx;
+		padding-bottom: 15rpx;
+		position: absolute;
+		bottom: -200rpx;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+	}
 	.header-content {
 		position: absolute;
 		top: 0;

pages/order/payment.vue

@@ -379,9 +379,9 @@
 							}
 						}
 					})
-				} else if (this.infodata.product_type == 1 || this.infodata.product_type == 2) {
+				} else if (this.infodata.product_type == 1) {
 					uni.requestSubscribeMessage({
-						tmplIds: ['M9b6PPKtD7PEqLsSnQ453iTIHtIZZpixOBjUjax8YXU', 'WCkfvW9NkV_oQgLsJJuwoVMF-G0ss9y4SkIgCObZwWA'],
+						tmplIds: ['M9b6PPKtD7PEqLsSnQ453iTIHtIZZpixOBjUjax8YXU'],
 						success: (res) => {
 							this.popupShow = true
 							this.show = true
@@ -391,9 +391,51 @@
 							this.show = true
 						}
 					})
-				} else if (this.infodata.product_type == 3 || this.infodata.product_type == 4 || this.infodata.product_type == 5) {
+				} else if (this.infodata.product_type == 2) {
+					uni.requestSubscribeMessage({
+						tmplIds: ['M9b6PPKtD7PEqLsSnQ453iTIHtIZZpixOBjUjax8YXU', 'WCkfvW9NkV_oQgLsJJuwoVMF-G0ss9y4SkIgCObZwWA',
+							'ZrL4Ag28cW2F1I1gWcnIk-fxNmZNhb-vNsx32j1ulG0'
+						],
+						success: (res) => {
+							this.popupShow = true
+							this.show = true
+						},
+						fail: (err) => {
+							this.popupShow = true
+							this.show = true
+						}
+					})
+				} else if (this.infodata.product_type == 3) {
+					uni.requestSubscribeMessage({
+						tmplIds: ['M9b6PPKtD7PEqLsSnQ453iTIHtIZZpixOBjUjax8YXU', 'Sg0lKmOexTnxxDzy39E26aNvmc3w4qKUnxl21A9dWns',
+							'phcsQ7ZbsJapfmx3NMCha0MrHCqFrgN7BWVneE5OffI'
+						],
+						success: (res) => {
+							this.popupShow = true
+							this.show = true
+						},
+						fail: (err) => {
+							this.popupShow = true
+							this.show = true
+						}
+					})
+				} else if (this.infodata.product_type == 4 || this.infodata.product_type == 5) {
+					uni.requestSubscribeMessage({
+						tmplIds: ['M9b6PPKtD7PEqLsSnQ453iTIHtIZZpixOBjUjax8YXU', 'Sg0lKmOexTnxxDzy39E26aNvmc3w4qKUnxl21A9dWns',
+							'phcsQ7ZbsJapfmx3NMChaxepR9tJFiqbO25P9tujErI'
+						],
+						success: (res) => {
+							this.popupShow = true
+							this.show = true
+						},
+						fail: (err) => {
+							this.popupShow = true
+							this.show = true
+						}
+					})
+				} else if (this.infodata.product_type == 6) {
 					uni.requestSubscribeMessage({
-						tmplIds: ['Sg0lKmOexTnxxDzy39E26aNvmc3w4qKUnxl21A9dWns'],
+						tmplIds: ['obCFv2gAnl_RaW-OlnZkjCfi6teT3LUaHxxInUkwLbw'],
 						success: (res) => {
 							this.popupShow = true
 							this.show = true

pages/service_packs/introduce.vue

@@ -14,8 +14,8 @@
 			</view>
 		</view>
 		<u-popup v-model="show" mode="bottom" border-radius="14"  height="300rpx">
-			<u-button open-type="contact" :custom-style="customStyle">会话客服</u-button>
-			<u-button @click="playphone" :custom-style="customStyle">电话客服</u-button>
+			<u-button open-type="contact" :custom-style="customStyle">在线咨询</u-button>
+			<u-button @click="playphone" :custom-style="customStyle">电话咨询</u-button>
 		</u-popup>
 	</view>
 </template>

pages/service_packs/packs_information.vue

@@ -55,7 +55,7 @@
 							<!-- 自定义左（header）右（footer）的内容 -->
 							<view slot="header">
 								<text class="xinghao">*</text>
-								<text style="font-size: 28rpx;">患者姓名</text>
+								<text style="font-size: 28rpx;">用户姓名</text>
 							</view>
 							<view slot="footer">
 								<text style="font-size: 30rpx;">{{value}}</text>
@@ -79,7 +79,7 @@
 							<!-- 自定义左（header）右（footer）的内容 -->
 							<view slot="header">
 								<text class="xinghao">*</text>
-								<text style="font-size: 28rpx;">患者是否有社保</text>
+								<text style="font-size: 28rpx;">是否有社保</text>
 							</view>
 							<view slot="footer">
 								<u-radio-group v-model="guarantee" @change="radioGroupChange">
@@ -89,7 +89,6 @@
 								</u-radio-group>
 							</view>
 						</uni-list-item>
-
 					</uni-list>
 				</view>
 			</view>

pages/vaccines/vaccines_info.vue

@@ -80,7 +80,7 @@
 			</view>
 		</u-popup>
 		<view class="cu-bar bg-white tabbar" style="position: fixed;bottom: 0;width: 100%;">
-			<view class="submit" style="background-color: #0B73B9;color: white;" @click="gotopay">
+			<view class="submit" style="background-color: #0B73B9;color: white;" @click="submitpay">
 				提交申请
 			</view>
 		</view>
@@ -300,7 +300,7 @@
 				}
 				this.dateshow = true
 			},
-			gotopay: async function() {
+			submitpay() {
 				if (this.huanzheID == "") {
 					uni.showToast({
 						title: "请先选择接种用户",
@@ -329,6 +329,20 @@
 					})
 					return false
 				}
+				uni.requestSubscribeMessage({
+					tmplIds: ['M9b6PPKtD7PEqLsSnQ453iTIHtIZZpixOBjUjax8YXU', 'Sg0lKmOexTnxxDzy39E26aNvmc3w4qKUnxl21A9dWns',
+						'phcsQ7ZbsJapfmx3NMChaxepR9tJFiqbO25P9tujErI'
+					],
+					success: (res) => {
+						this.gotopay()
+					},
+					fail: (err) => {
+						this.gotopay()
+					}
+				})
+			},
+			gotopay: async function() {
+
 				let obj = {
 					product_type: 4,
 					patient_id: this.huanzheID,