老狐\25396 %!s(int64=4) %!d(string=hai) anos
pai
achega
efffe527cd
Modificáronse 83 ficheiros con 734 adicións e 199 borrados
  1. 11 16
      pages.json
  2. 3 44
      pages/archives/my_archives.vue
  3. 5 5
      pages/doctor_related/doctor_info.vue
  4. 34 29
      pages/doctor_related/info_write.vue
  5. 1 1
      pages/index/index.vue
  6. 27 29
      pages/index/mine.vue
  7. 31 43
      pages/login/login.vue
  8. 2 2
      pages/order/order.vue
  9. 1 2
      pages/service_packs/choicepacks.vue
  10. 2 1
      pages/service_packs/introduce.vue
  11. 278 10
      pages/service_packs/packs_details.vue
  12. BIN=BIN
      static/头像.png
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-badge/uni-badge.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-icons/uni-icons.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-list-item/uni-list-item.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-list/uni-list.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/watch-button.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/watch-input.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/archives/my_archives.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/doctor_related/doctor_info.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/doctor_related/info_write.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/doctor_related/select_doctor.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/book.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/mine.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/order.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/payment.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/coupon/coupon.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/service_packs/choicepacks.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/service_packs/introduce.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/service_packs/packs_details.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/service_packs/packs_information.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-back-top/u-back-top.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-card/u-card.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-cell-group/u-cell-group.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-cell-item/u-cell-item.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-column-notice/u-column-notice.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-dropdown-item/u-dropdown-item.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-dropdown/u-dropdown.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-gap/u-gap.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-grid-item/u-grid-item.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-grid/u-grid.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-image/u-image.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-line/u-line.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading/u-loading.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loadmore/u-loadmore.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map
  53. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-notice-bar/u-notice-bar.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-picker/u-picker.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-radio-group/u-radio-group.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-radio/u-radio.js.map
  58. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-rate/u-rate.js.map
  59. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-read-more/u-read-more.js.map
  60. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-row-notice/u-row-notice.js.map
  61. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-search/u-search.js.map
  62. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-section/u-section.js.map
  63. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-select/u-select.js.map
  64. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-steps/u-steps.js.map
  65. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map
  66. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tag/u-tag.js.map
  67. 2 1
      unpackage/dist/dev/mp-weixin/app.json
  68. 4 2
      unpackage/dist/dev/mp-weixin/pages/order/order.wxss
  69. 1 0
      unpackage/dist/dev/mp-weixin/pages/personal/coupon/coupon_details.wxss
  70. 1 0
      unpackage/dist/dev/mp-weixin/pages/personal/personal_information.wxss
  71. 0 1
      unpackage/dist/dev/mp-weixin/pages/service_packs/choicepacks.js
  72. 1 1
      unpackage/dist/dev/mp-weixin/pages/service_packs/choicepacks.wxml
  73. 1 1
      unpackage/dist/dev/mp-weixin/pages/service_packs/introduce.wxml
  74. 169 1
      unpackage/dist/dev/mp-weixin/pages/service_packs/packs_details.js
  75. 0 1
      unpackage/dist/dev/mp-weixin/pages/service_packs/packs_details.wxml
  76. 110 7
      unpackage/dist/dev/mp-weixin/pages/service_packs/packs_details.wxss
  77. 29 2
      unpackage/dist/dev/mp-weixin/project.config.json
  78. 7 0
      unpackage/dist/dev/mp-weixin/sitemap17.json
  79. 7 0
      unpackage/dist/dev/mp-weixin/sitemap34.json
  80. 7 0
      unpackage/dist/dev/mp-weixin/sitemap52.json
  81. BIN=BIN
      unpackage/dist/dev/mp-weixin/static/img/xieyi.png
  82. BIN=BIN
      unpackage/dist/dev/mp-weixin/static/img/xieyixuan.png
  83. BIN=BIN
      unpackage/dist/dev/mp-weixin/static/头像.png

+ 11 - 16
pages.json

xqd xqd xqd xqd xqd xqd xqd
@@ -42,13 +42,7 @@
 		{
 			"path": "pages/archives/my_archives",
 			"style": {
-				"navigationBarTitleText": "档案列表"
-			}
-		},
-		{
-			"path": "pages/archives/add_archives",
-			"style": {
-				"navigationBarTitleText": "添加档案"
+				"navigationBarTitleText": "档案编辑"
 			}
 		},
 		{
@@ -57,7 +51,7 @@
 				"navigationBarTitleText": "登录/注册"
 			}
 		},
-		/*		order文件夹	订单		*/
+/*		order文件夹	订单		*/
 		//付款
 		{
 			"path": "pages/order/payment",
@@ -72,7 +66,7 @@
 				"navigationBarTitleText": "下单成功"
 			}
 		},
-		/*		service_packs文件夹	服务包	*/
+/*		service_packs文件夹	服务包	*/
 		//服务人信息
 		{
 			"path": "pages/service_packs/packs_information",
@@ -101,16 +95,16 @@
 				"navigationBarTitleText": "服务包"
 			}
 		},
-		/*		personal文件夹		个人中心	*/
+/*		personal文件夹		个人中心	*/
 		//个人信息
 		{
 			"path": "pages/personal/personal_information",
 			"style": {
 				"navigationBarTitleText": "个人信息"
 			}
-
+			
 		},
-		/*	coupon文件夹		优惠券*/
+	/*	coupon文件夹		优惠券*/
 		//优惠券
 		{
 			"path": "pages/personal/coupon/coupon",
@@ -125,8 +119,8 @@
 				"navigationBarTitleText": "优惠券详情"
 			}
 		}
-
-
+		
+		
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -136,7 +130,7 @@
 	},
 	"tabBar": {
 		"color": "#C0C4CC", //未选中的菜单文字颜色
-		"selectedColor": "#0B73B9", //选中时的菜单文字颜色
+		"selectedColor": "#fab6b6", //选中时的菜单文字颜色
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff", //背景
 		"list": [{
@@ -164,7 +158,8 @@
 		"current": 0,
 		"list": [{
 			"name": "介绍",
-			"path": "pages/service_packs/packs_details"
+			"path": "pages/service_packs/introduce"
+			// "path": "pages/service_packs/packs_details"
 		}]
 	}
 }

+ 3 - 44
pages/archives/my_archives.vue

xqd xqd
@@ -1,30 +1,6 @@
 <template>
 	<view class="main">
-		<view class="cu-list menu-avatar margin-sm" v-for="(item,index) in patientList" :key="index" style="border-radius: 16rpx;box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);">
-			<view class="cu-item">
-				<view class="cu-avatar round lg" :style="'background-image:url('+item.avatar+');'"></view>
-				<view class="content">
-					<view class="text-grey">{{item.name}}</view>
-					<view class="text-gray text-sm flex">
-						<text class="text-cut">
-							{{item.sex==1?'男':'女'}}
-						</text>
-						<text class="text-cut margin-left-sm">
-							{{}}
-						</text>
-					</view>
-				</view>
-				<view class="action">
-					<text class="cuIcon-roundright lg text-gray"></text>
-				</view>
-			</view>
-		</view>
-		<u-empty text="暂无档案" :show="istrue" mode="list" margin-top="300"></u-empty>
-		<view class="cu-bar bg-white tabbar" style="position: fixed;bottom: 0;width: 100%;">
-			<view class="submit" style="background-color: #0B73B9;color: white;" @click="addarchives">
-				添加健康档案
-			</view>
-		</view>
+		
 	</view>
 </template>
 
@@ -32,31 +8,14 @@
 	export default {
 		onLoad(options) {
 
-		},
-		onShow() {
-			this.getarchives()
 		},
 		data() {
 			return {
-				patientList: [],
-				istrue: false
+
 			}
 		},
 		methods: {
-			getarchives: async function() {
-				let res = await this.$request.post("/api/v1/patient/patientList")
-				if (res.status == 0) {
-					this.patientList = res.data.data
-					if (this.patientList.length == 0) {
-						this.istrue = true
-					}
-				}
-			},
-			addarchives() {
-				uni.navigateTo({
-					url: "add_archives"
-				})
-			}
+			
 		}
 	};
 </script>

+ 5 - 5
pages/doctor_related/doctor_info.vue

xqd xqd xqd xqd xqd
@@ -2,7 +2,7 @@
 	<view class="main">
 		<view>
 			<view class="pr det-body">
-				<image class="det-bg-img" mode="scaleToFill" src="../../static/img/doctorbanner.png"></image>
+				<image class="det-bg-img" mode="scaleToFill" src="http://file.supermm.me/miniProgram/images/det/det_bg_01.png"></image>
 				<view class="det-head pr plr15 bdr8 m-bg-white mlr15 pt25">
 					<view class="m-xstart pr m-bottom-line pb25 margin-bottom-sm">
 						<view class="m-flex overflow mr10">
@@ -87,7 +87,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="margin-lr-sm mt15 bg-white" style="border-radius: 16rpx; box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);"
+			<view class="margin-lr-sm mt30 bg-white" style="border-radius: 16rpx; box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);"
 			 v-if="doctor.evaluate.length!=0">
 				<view class="f18 fb flex align-center plr15 pt15">患者评价 <text class="f12 m-gray-letter margin-left-xs">({{doctor.evaluate.length}})</text>
 				</view>
@@ -217,7 +217,7 @@
 			},
 			phonezixun() {
 				uni.navigateTo({
-					url: "info_write?doctor=" + JSON.stringify(this.doctor)
+					url: "info_write"
 				})
 			},
 			xuantime() {
@@ -234,7 +234,7 @@
 		height: 340rpx;
 		background-color: #fff;
 		border-radius: 16rpx;
-		margin-top: 30rpx;
+		margin-top: 60rpx;
 		box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);
 	}
 
@@ -251,7 +251,7 @@
 		z-index: 1;
 		display: block;
 		width: 100%;
-		height: 267rpx;
+		height: 400rpx;
 	}
 
 	.det-head {

+ 34 - 29
pages/doctor_related/info_write.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -2,12 +2,12 @@
 	<view class="main">
 		<view class="cu-list menu-avatar">
 			<view class="cu-item">
-				<view class="cu-avatar round lg" :style="'background-image:url('+doctor.avatar+');'"></view>
+				<view class="cu-avatar round lg" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big10001.jpg);"></view>
 				<view class="content">
-					<view class="text-grey">{{doctor.name}}</view>
+					<view class="text-grey">医生姓名</view>
 					<view class="text-gray text-sm flex">
 						<text class="text-cut">
-							{{doctor.office.name}} {{doctor.qualification.name}}
+							科室名称 医生资质
 						</text>
 					</view>
 				</view>
@@ -38,7 +38,7 @@
 					<text class="text-grey">咨询时间</text>
 				</view>
 				<view class="action">
-					<text class="text-grey text-sm">{{doctor.phone_minutes}}分钟</text>
+					<text class="text-grey text-sm">10分钟</text>
 				</view>
 			</view>
 			<view class="cu-item">
@@ -46,12 +46,12 @@
 					<text class="text-grey">咨询费用</text>
 				</view>
 				<view class="action">
-					<text class="text-grey text-sm">{{doctor.phone_price}}元</text>
+					<text class="text-grey text-sm">19.9元</text>
 				</view>
 			</view>
 		</view>
 		<view class="cu-bar bg-white tabbar" style="position: fixed;bottom: 0;width: 100%;">
-			<view class="submit" style="background-color: #0B73B9;color: white;" @click="">
+			<view class="bg-green submit" @click="">
 				立即咨询
 			</view>
 		</view>
@@ -63,11 +63,11 @@
 				<view class="popup_title_text">选择就诊人</view>
 			</view>
 			<scroll-view style="height: 70%;" scroll-y="true">
-				<view class="popup_list" v-for="(item, index) in patientList" :key="index" :data-index="index" @click="value=item.name,showpeople=false">
+				<view class="popup_list" v-for="(item, index) in list" @click="value=item.name,showpeople=false">
 					<view class="popup_list_title">
 						<view class="title">{{item.name}}</view>
 						<view class="body">
-							{{item.sex==1?'男':'女'}}
+							男 18天
 						</view>
 					</view>
 					<view class="popup_list_button flex align-center">
@@ -80,10 +80,7 @@
 			</scroll-view>
 			<u-gap height="10" bg-color="#f9f9f9"></u-gap>
 			<view class="popup_button">
-				<image style="width: 32rpx;height: 32rpx;margin-right: 15rpx;" src="../../static/img/addjiu.png" mode=""></image>
-				<view class="" @click="addPeople">
-					添加就诊人档案
-				</view>
+				<text class="" @click="addPeople">添加就诊人</text>
 			</view>
 		</u-popup>
 
@@ -122,16 +119,32 @@
 	export default {
 		onLoad(options) {
 			this.phonenum = this.phoneList[0].num
-			this.doctor = JSON.parse(options.doctor)
-			console.log(this.doctor)
-		},
-		onShow() {
-			this.getarchives()
 		},
 		data() {
 			return {
 				/* 就诊人 */
 				showpeople: false,
+				list: [{
+						name: '测试1',
+						disabled: false
+					},
+					{
+						name: '测试2',
+						disabled: false
+					},
+					{
+						name: '测试3',
+						disabled: false
+					},
+					{
+						name: '测试4',
+						disabled: false
+					},
+					{
+						name: '测试5',
+						disabled: false
+					}
+				],
 				// u-radio-group的v-model绑定的值如果设置为某个radio的name,就会被默认选中
 				value: '',
 				/* 接听号码 */
@@ -152,9 +165,7 @@
 				phoneValue: '',
 				showinput: '其他手机号',
 				phonenum: "",
-				phonedata: "",
-				patientList: [],
-				doctor: {}
+				phonedata: ""
 			}
 		},
 		methods: {
@@ -175,7 +186,7 @@
 			},
 			phoneListchange(item) {
 				this.phoneValue = item
-				console.log(this.phoneValue)
+				console.log(item)
 			},
 			peopleListchange(item) {
 				this.value = item
@@ -194,13 +205,7 @@
 			confirmphone() {
 				this.phonenum = this.phonedata
 				this.showphone = !this.showphone
-			},
-			getarchives: async function() {
-				let res = await this.$request.post("/api/v1/patient/patientList")
-				if (res.status == 0) {
-					this.patientList = res.data.data
-				}
-			},
+			}
 
 		}
 	};
@@ -263,7 +268,7 @@
 		justify-content: center;
 		align-items: center;
 
-		view {
+		text {
 			color: #0b73ba;
 			font-weight: 500;
 		}

+ 1 - 1
pages/index/index.vue

xqd
@@ -13,7 +13,7 @@
 			<u-grid :col="3" :border="false">
 				<view @click="gotoxuanze" data-index="1">
 					<u-grid-item>
-						<u-image width="120rpx" height="120rpx" src="../static/toolimg/indexphone" shape="circle"></u-image>
+						<u-image width="120rpx" height="120rpx" src="https://cdn.uviewui.com/uview/example/fade.jpg" shape="circle"></u-image>
 						<view class="grid-text">电话咨询</view>
 					</u-grid-item>
 				</view>

+ 27 - 29
pages/index/mine.vue

xqd xqd xqd xqd xqd
@@ -2,28 +2,29 @@
 	<view class="main">
 		<view class="pr">
 			<view class="header-content">
-				<image src="../../static/img/mybanner.png" style="width:100%;height:260rpx;"></image>
+				<image src="http://file.supermm.me/miniProgram/images/personal/bg.png" style="width:100%;height:260rpx;"></image>
 			</view>
 			<view class="pr" style="z-index:2">
 				<view class="plr15">
 					<view class="bdr4 pb20">
 						<view class="m-dpflex m-justify-start m-align-center" style="height: 165rpx;">
-							<image binderror="_binderror" mode="scaleToFill" :src="info.avatar" style="width: 120rpx;height: 120rpx;border-radius: 50%;"></image>
-							<text class="line1 f20 fb plr15 text-white">{{info.nickname}}</text>
+							<image binderror="_binderror" mode="scaleToFill" src="https://ossweb-img.qq.com/images/lol/web201310/skin/big84000.jpg"
+							 style="width: 120rpx;height: 120rpx;border-radius: 50%;"></image>
+							<text class="line1 f20 fb plr15 text-white">落雨桐</text>
 							<navigator hoverClass="none">
-								<image class="header-img" src="../../static/toolimg/myedit.png"></image>
+								<image class="header-img" src="http://file.supermm.me/miniProgram/images/personal/edit.png"></image>
 							</navigator>
 							<view class="pr tr m-flex">
 								<view class="tip msg" v-if="true"></view>
 								<navigator hoverClass="none">
-									<image class="header-img" src="../../static/toolimg/myinfo.png"></image>
+									<image class="header-img" src="http://file.supermm.me/miniProgram/images/personal/info.png"></image>
 								</navigator>
 							</view>
 						</view>
 						<view class="pr m-xcenter plr20 header-box" style="padding: 40rpx 40rpx;background-color: #fff;border-radius: 16rpx;">
 							<navigator class="m-flex tl f14 m-ycenter dpb" hoverClass="none">
-								<view class="m-gray-big f20 fb pr10">{{info.balance}}</view>
-								<view class="m-gray-letter mt5 f12">余额(元)</view>
+								<view class="m-gray-big f20 fb pr10">0</view>
+								<view class="m-gray-letter mt5 f12">代币(个)</view>
 							</navigator>
 							<view bindtap="" class="m-flex tl f14 m-ycenter">
 								<view class="m-gray-big f20 fb">0</view>
@@ -36,34 +37,38 @@
 			<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">
-					<image style="width: 76rpx;height: 76rpx;" src="../../static/img/myzixun.png" mode=""></image>
+					<image style="width: 76rpx;height: 76rpx;" src="http://file.supermm.me/miniProgram/images/personal/menu_1.png"
+					 mode=""></image>
 					<view class="tip"></view>
 					<view class="f14 m-gray-small mt10 line1">我的咨询</view>
 				</navigator>
 				<navigator class="width25 m-ycenter overflow pr" hoverClass="none">
-					<image style="width: 76rpx;height: 76rpx;" src="../../static/img/myyuyue.png" mode=""></image>
+					<image style="width: 76rpx;height: 76rpx;" src="http://file.supermm.me/miniProgram/images/personal/menu_2.png"
+					 mode=""></image>
 					<view class="tip"></view>
 					<view class="f14 m-gray-small mt10 line1">我的预约</view>
 				</navigator>
 				<navigator class="width25 m-ycenter overflow pr" hoverClass="none">
-					<image style="width: 76rpx;height: 76rpx;" src="../../static/img/myyijian.png" mode=""></image>
+					<image style="width: 76rpx;height: 76rpx;" src="http://file.supermm.me/miniProgram/images/personal/menu_3.png"
+					 mode=""></image>
 					<view class="tip"></view>
 					<view class="f14 m-gray-small mt10 line1">我的意见单</view>
 				</navigator>
 				<navigator class="width25 m-ycenter overflow pr" hoverClass="none">
-					<image style="width: 76rpx;height: 76rpx;" src="../../static/img/myservice.png" mode=""></image>
+					<image style="width: 76rpx;height: 76rpx;" src="http://file.supermm.me/miniProgram/images/personal/menu_4.png"
+					 mode=""></image>
 					<view class="tip"></view>
 					<view class="f14 m-gray-small mt10 line1">服务包订单</view>
 				</navigator>
 			</view>
-			<navigator class="pr m-xcenter plr20 pt20" hoverClass="none" url="../archives/my_archives">
+			<navigator class="pr m-xcenter plr20 pt20" hoverClass="none">
 				<view class="fb f18 pr m-flex tl">健康档案</view>
 				<view class="pr m-gray-small">档案列表</view>
 				<label class="m-gray-letter iconfont icon-arrow-right f18 dpb"></label>
 			</navigator>
-			<view class="mt20 pr pb40" style="margin-left: 20rpx;margin-right: 20rpx;box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);">
+			<view class="mt20 pr pb40" style="margin-left: 20rpx;margin-right: 20rpx;">
 				<swiper duration="500" @change="swiperChange" :current="itemcurrent" interval="5000" style="height:380rpx;" class="swiper-box">
-					<swiper-item class="" style="box-sizing: border-box;" v-for="(item,index) in 4" :key="index">
+					<swiper-item class="swiper-wrapper" style="" v-for="(item,index) in 4" :key="index">
 						<view class="bg-white" style="border-radius: 16rpx;height: 100%;">
 							<navigator class="m-ycenter pt40" hoverClass="none" url="" v-if="false">
 								<view class="bdr30 m-theme br-theme tc plr20 pt8 pb8 f14 width40">新增健康档案</view>
@@ -98,34 +103,30 @@
 			<view class="bg-white margin-lr-sm margin-top-sm" style="border-radius: 16rpx;box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);">
 				<view class="plr10 m-dpflex m-justify-start m-align-center overflow pt30 pb30">
 					<navigator class="width25 m-ycenter overflow pr" hoverClass="none">
-						<image style="width: 42rpx;height: 42rpx;" src="../../static/toolimg/mydoctor.png"></image>
+						<image style="width: 42rpx;height: 42rpx;" src="http://file.supermm.me/miniProgram/images/personal/tool_1.png"></image>
 						<view class="f14 m-gray-small mt10 line1">家庭医生</view>
 					</navigator>
 					<navigator class="width25 m-ycenter overflow pr" hoverClass="none">
-						<image style="width: 42rpx;height: 42rpx;" src="../../static/toolimg/myguanzhu.png"></image>
+						<image style="width: 42rpx;height: 42rpx;" src="http://file.supermm.me/miniProgram/images/personal/tool_2.png"></image>
 						<view class="f14 m-gray-small mt10 line1">我的关注</view>
 					</navigator>
 					<navigator class="width25 m-ycenter overflow pr" hoverClass="none">
-						<image style="width: 42rpx;height: 42rpx;" src="../../static/toolimg/wenzhang.png"></image>
+						<image style="width: 42rpx;height: 42rpx;" src="http://file.supermm.me/miniProgram/personal/my-class/my_class.png"></image>
 						<view class="f14 m-gray-small mt10 line1">收藏文章</view>
 					</navigator>
 					<navigator class="width25 m-ycenter overflow pr" hoverClass="none">
-						<image style="width: 42rpx;height: 42rpx;" src="../../static/toolimg/baodan.png"></image>
+						<image style="width: 42rpx;height: 42rpx;" src="http://file.supermm.me/miniProgram/personal/my-class/my_class.png"></image>
 						<view class="tip"></view>
 						<view class="f14 m-gray-small mt10 line1">我的保单</view>
 					</navigator>
 				</view>
 				<view class="plr10 m-dpflex m-justify-start m-align-center overflow pb30">
 					<navigator class="width25 m-ycenter overflow pr" hoverClass="none">
-						<image style="width: 42rpx;height: 42rpx;" src="../../static/toolimg/pinjia.png"></image>
-						<view class="f14 m-gray-small mt10 line1">我的评价</view>
-					</navigator>
-					<navigator class="width25 m-ycenter overflow pr" hoverClass="none">
-						<image style="width: 42rpx;height: 42rpx;" src="../../static/toolimg/myhple.png"></image>
+						<image style="width: 42rpx;height: 42rpx;" src="http://file.supermm.me/miniProgram/images/personal/tool_5.png"></image>
 						<view class="f14 m-gray-small mt10 line1">帮助反馈</view>
 					</navigator>
 					<view bindtap="" class="width25 m-ycenter overflow pr">
-						<image style="width: 42rpx;height: 42rpx;" src="../../static/toolimg/kefu.png"></image>
+						<image style="width: 42rpx;height: 42rpx;" src="https://file.supermm.me/h5/wechat-h5/personal/kf.png"></image>
 						<view class="f14 m-gray-small mt10 line1">客服咨询</view>
 					</view>
 				</view>
@@ -146,8 +147,7 @@
 		},
 		data() {
 			return {
-				itemcurrent: 0,
-				info: {}
+				itemcurrent: 0
 			}
 		},
 		methods: {
@@ -156,9 +156,7 @@
 			},
 			getUserInfo: async function() {
 				let res = await this.$request.post('/api/v1/user/userInfo')
-				if (res.status == 0) {
-					this.info = res.data
-				}
+				console.log(res)
 			}
 		}
 	};

+ 31 - 43
pages/login/login.vue

xqd xqd xqd
@@ -67,10 +67,13 @@
 				showAgree: true, //协议是否选择
 				isRotate: false, //是否加载旋转
 				istrue: false,
-				num: 1,
+				imgarr: [
+					"../../static/img/xieyi.png",
+					"../../static/img/xieyi.png"
+				],
 				imgitem: {
 					istrue: false,
-					name: "../../static/img/xieyi.png"
+					name: ""
 				}
 			}
 		},
@@ -156,43 +159,36 @@
 				}, 3000)
 			},
 			wxLogin: async function(e) {
-				if (this.imgitem.istrue) {
-					_this.istrue = true
-					if (e.detail.errMsg == "getUserInfo:fail auth deny") {
+				_this.istrue = true
+				if (e.detail.errMsg == "getUserInfo:fail auth deny") {
+					uni.showToast({
+						title: '微信登录失败',
+						icon: "none"
+					});
+					return;
+				}
+				user.loginByWeixin(e.detail.userInfo)
+					.then(res => {
+						if (res.status == 0) {
+							uni.showToast({
+								title: "登录成功",
+								icon: "none",
+								duration: 2000
+							})
+						}
+						setTimeout(function() {
+							_this.istrue = false
+							uni.navigateBack({
+								delta: 1
+							})
+						}, 2000)
+					})
+					.catch(res => {
 						uni.showToast({
 							title: '微信登录失败',
 							icon: "none"
 						});
-						return;
-					}
-					user.loginByWeixin(e.detail.userInfo)
-						.then(res => {
-							if (res.status == 0) {
-								uni.showToast({
-									title: "登录成功",
-									icon: "none",
-									duration: 2000
-								})
-							}
-							setTimeout(function() {
-								_this.istrue = false
-								uni.navigateBack({
-									delta: 1
-								})
-							}, 2000)
-						})
-						.catch(res => {
-							uni.showToast({
-								title: '微信登录失败',
-								icon: "none"
-							});
-						});
-				}else{
-					uni.showToast({
-						title:"请先同意协议",
-						icon:"none"
-					})
-				}
+					});
 			},
 			toindex() {
 				uni.switchTab({
@@ -200,15 +196,7 @@
 				})
 			},
 			isqueren() {
-				this.num++
-				if (this.num % 2 == 0) {
-					this.imgitem.name = "../../static/img/xieyixuan.png"
-					this.imgitem.istrue = true
 
-				} else {
-					this.imgitem.name = "../../static/img/xieyi.png"
-					this.imgitem.istrue = false
-				}
 			}
 		}
 	}

+ 2 - 2
pages/order/order.vue

xqd xqd
@@ -66,7 +66,7 @@
 		.card_img {
 			height: 40%;
 			width: 100%;
-			display: inline-block;//
+			display: flex;//
 			justify-content: center;
 			align-items: flex-end;
 
@@ -93,7 +93,7 @@
 		.describe {
 			height: 35%;
 			width: 100%;
-			display: inline-block;
+			display: block;
 			text-align: center;
 			view {
 				padding-top: 5rpx;

+ 1 - 2
pages/service_packs/choicepacks.vue

xqd xqd
@@ -2,7 +2,7 @@
 	<view style="width: 100vw;height: auto;padding: 30rpx 20rpx;background-color: #f6f6f6;">
 		<view style="width: 100%;height: 100%;">
 			<text style="font-size: 30rpx;font-weight: bold;">官方套餐</text>
-			<view v-for="item,index in array">
+			<view v-for="item,index in array" :key='index'>
 				<view class="card">
 					<view class="taocan" @click="details">
 						<view class="tc_left">
@@ -27,7 +27,6 @@
 
 <script>
 	export default {
-		name: 'productdetailspage',
 		data() {
 			return {
 				array: [{

+ 2 - 1
pages/service_packs/introduce.vue

xqd xqd
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="body">
-			<image src="../../static/占位图.png" class="img"></image>
+			<image src="../../static/占位图.png" class="img"></image>
 		</view>
 		<view class="footer">
 			<view class="cu-bar bg-white tabbar border shop" style="width: 100%;">
@@ -29,6 +29,7 @@
 					url: '/pages/service_packs/choicepacks'
 				});
 			}
+						
 		}
 	}
 </script>

+ 278 - 10
pages/service_packs/packs_details.vue

xqd xqd xqd xqd
@@ -2,17 +2,68 @@
 	<view style="width: 100%;height: 100%;background-color: #ececec;">
 		<!-- 卡券 -->
 		<view class="card">
-			<view>
+			<view class="card_view">
 				<!-- 放图片 标题 -->
 				<view class="title">
 					<image src="../../static/横占位图.png" class="img"></image>
 				</view>
 				<!-- 放描述 -->
-				<view class="describe"></view>
+				<view class="describe">
+					<view style="font-size: 40rpx;font-weight: bold;">{{tcID}}</view>
+					<view style="font-size: 28rpx;font-weight: bold;padding-top: 60rpx;">有效期</view>
+					<view style="font-size: 26rpx;color: #999999;padding-top: 30rpx;">自购买服务起{{tcTime}}</view>
+					<view style="font-size: 28rpx;font-weight: bold;padding-top: 50rpx;">服务包内容介绍</view>
+					<view style="font-size: 26rpx;color: #999999;">
+						<view style="padding: 27rpx 0 12rpx 0;">{{tcContent.content}}</view>
+						<view style="padding: 12rpx 0;">{{tcContent.scope}}</view>
+						<view style="padding: 12rpx 0;">{{tcContent.giving}}</view>
+					</view>
+					<view style="font-size: 28rpx;font-weight: bold;padding-top: 48rpx;">家属团队</view>
+					<view class="list" v-for="item,index in tcTeam" :key='index'>
+						<!-- 头像 -->
+						<view class="portrait">
+							<view style="padding-top: 20rpx;">
+								<image class="img" src="../../static/头像.png"></image>
+								<view class="bun" @click="follow">关注</view>
+							</view>
+						</view>
+						<!-- 文字 -->
+						<view class="text">
+							<!-- 名字+标签 -->
+							<view class="name">
+								<view style="margin-right: 15rpx;">{{item.name}}</view>
+								<view class="label">{{item.label1}}</view>
+								<view class="label">{{item.label2}}</view>
+							</view>
+							<!-- 科室 -->
+							<view class="department">
+								<text>科室:</text>
+								<text style="color: #333333;">{{item.department1}}</text>
+								<text style="color: #333333;">{{item.department2}}</text>
+							</view>
+							<!-- 选项 -->
+							<view class="option">
+								<view>图文</view>
+								<view>电话</view>
+								<view>门诊</view>
+							</view>
+						</view>
+					</view>
+				</view>
 			</view>
 		</view>
-		<view class="round" style="position:absolute;top: 20vh;right:0;"></view>
-		<view class="round" style="position:absolute;top: 20vh;"></view>
+		<!-- 协议 -->
+		<view style="height: 200rpx;width: 100%;display: flex;justify-content: flex-end;">
+			<view style="height: 35rpx;width: auto;font-size: 24rpx;margin-right: 30rpx;display: flex;align-items: center;">
+				<image @click="isqueren" :src="imgitem.name" mode="" style="width: 30rpx;height: 30rpx;margin-right: 10rpx;"></image>
+				<text style="color: #999999;">已阅读并同意</text>
+				<text style="color: #0B73B9;">《超级宝妈宝》</text>
+				<text style="color: #999999;">服务协议</text>
+			</view>
+		</view>
+		<!-- 两个半圆 -->
+		<view class="round" style="position:absolute;top: 25vh;right:0;"></view>
+		<view class="round" style="position:absolute;top: 25vh;"></view>
 		<!-- 底部按钮 -->
 		<view class="footer">
 			<view class="cu-bar bg-white tabbar border shop" style="width: 100%;">
@@ -21,13 +72,129 @@
 					</view>
 					客服
 				</button>
-				<view class="submit" @click="next" style="background-color: #0B73B9; color: #FFFFFF;">选购服务包</view>
+				<view class="submit" @click="next" style="background-color: #0B73B9; color: #FFFFFF;">下一步</view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	export default {
+		name: 'productdetailspage',
+		data() {
+			return {
+				//协议
+				num: 1,
+				imgitem: {
+					istrue: false,
+					name: "../../static/img/xieyi.png"
+				},
+				tcID: '套餐一', //ID
+				tcTime: '一年', //套餐有效期
+				tcContent: { //套餐内容
+					content: '套餐一包含包含疫苗接种、门诊预约、儿保预约三项服务', //内容
+					scope: '使用范围:家医团队可用,有效期内无限次、300元额度以内门诊预约与儿保预约无限制', //范围
+					giving: '赠送XXXX保险:保险介绍' //赠送
+				},
+				tcTeam: [{
+					id: '1',
+					name: '熊大',
+					label1: '熊',
+					label2: '主角',
+					department1: '外科',
+					department2: '主任医师'
+				}, {
+					id: '1',
+					name: '熊二',
+					label1: '熊',
+					label2: '主角',
+					department1: '外科',
+					department2: '主任医师'
+				}, {
+					id: '1',
+					name: '光头强',
+					label1: '人',
+					label2: '主角',
+					department1: '外科',
+					department2: '主任医师'
+				}, {
+					id: '1',
+					name: '李老板',
+					label1: '人',
+					label2: '配角',
+					department1: '外科',
+					department2: '主任医师'
+				}, {
+					id: '1',
+					name: '吉吉国王',
+					label1: '猴子',
+					label2: '配角',
+					department1: '外科',
+					department2: '主任医师'
+				}, {
+					id: '1',
+					name: '毛毛',
+					label1: '猴子',
+					label2: '配角',
+					department1: '外科',
+					department2: '主任医师'
+				}, {
+					id: '1',
+					name: '蹦蹦',
+					label1: '猴子',
+					label2: '配角',
+					department1: '外科',
+					department2: '主任医师'
+				}],
+				packs: {
+					id: '', //ID
+					name: '', //名称
+					intro: '', //简介
+					desc: '', //详细介绍
+					price: '', //价格(单位分)
+					team_id: '', //医生团队ID
+					phone_minutes: '', //电话分钟数
+					chat_num: '', //图文咨询次数
+					appoint_num: '', //门诊预约次数
+					vaccine_limit_amount: '', //疫苗总金额限制
+					nurses_limit_amount: '', //儿保总金额限制
+					effective_days: '', //有效天数
+					created_at: '', //创建时间
+					updated_at: '' //更新时间
+				}
+			}
+		},
+		methods: {
+			//关注
+			follow(e) {
+
+			},
+			isqueren() {
+				this.num++
+				if (this.num % 2 == 0) {
+					this.imgitem.name = "../../static/img/xieyixuan.png"
+					this.imgitem.istrue = true
+
+				} else {
+					this.imgitem.name = "../../static/img/xieyi.png"
+					this.imgitem.istrue = false
+				}
+			},
+			next(e) {
+				if (this.imgitem.istrue == false) {
+					uni.showToast({
+						icon: 'none',
+						position: 'bottom',
+						title: '请先同意《协议》'
+					});
+				}else{
+					uni.navigateTo({
+						url:'/pages/service_packs/packs_information'
+					})
+				}
+			}
+		}
+	}
 </script>
 
 <style lang="scss">
@@ -40,7 +207,7 @@
 	}
 
 	.round {
-		height: 50rpx;
+		height: 45rpx;
 		width: 50rpx;
 		border-radius: 50%;
 		background-color: #ececec;
@@ -50,26 +217,127 @@
 		padding: 30rpx 30rpx;
 		box-sizing: border-box;
 
-		view {
+		.card_view {
 			width: 100%;
 			background-color: #ffffff;
 			border-radius: 15rpx;
+
 			.title {
 				width: 100%;
 				height: 20vh;
 				display: flex;
 				justify-content: center;
 				align-items: flex-end;
-				.img{
-					width: 85%;
+
+				.img {
+					width: 90%;
 					height: 90%;
 				}
 			}
+
 			.describe {
 				width: 100%;
-				height: 80vh;
+				height: 1;
+				padding: 100rpx 40rpx 20rpx 40rpx;
+			}
+		}
+	}
+
+	.list {
+		margin: 20rpx 0 10rpx 0;
+		display: flex;
+		width: 100%;
+		height: 200rpx;
+		border-radius: 15rpx;
+		background-color: #FFFFFF;
+		box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.08);
+
+		.portrait {
+			width: 30%;
+			height: 100%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
 
+
+			.img {
+				width: 100rpx;
+				height: 100rpx;
+				border-radius: 50%;
+			}
+
+			.bun {
+				text-align: center;
+				width: 80rpx;
+				height: 36rpx;
+				background-color: #D92975;
+				margin: 0 10rpx;
+				border-radius: 60rpx;
+				position: relative;
+				top: -20rpx;
+				font-size: 20rpx;
+				color: #FFFFFF;
+				padding: 3rpx 0;
+			}
+		}
+
+		//文字
+		.text {
+			width: 70%;
+			height: 100%;
+
+			padding: 20rpx 0;
+
+			//名字+标签
+			.name {
+				font-size: 30rpx;
+				font-weight: bold;
+				display: flex;
+				align-items: center;
+
+				.label {
+					font-weight: 400;
+					margin-right: 15rpx;
+					background-color: #E5F5FF;
+					color: #0B73B9;
+					width: 100rpx;
+					height: 28rpx;
+					font-size: 20rpx;
+					border-radius: 10rpx;
+					text-align: center;
+				}
+			}
+
+			//科室
+			.department {
+				padding: 20rpx 0;
+				color: #666666;
+
+				text {
+					margin-right: 15rpx;
+				}
+			}
+
+			// 选项
+			.option {
+				display: flex;
+
+				view {
+					background-color: #E4E4E4;
+					width: 100rpx;
+					height: 48rpx;
+					border-radius: 12px;
+					margin-right: 15rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
 			}
+
 		}
+
+
+
 	}
 </style>

BIN=BIN
static/头像.png


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-badge/uni-badge.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-icons/uni-icons.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-list-item/uni-list-item.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-list/uni-list.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/watch-button.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/watch-input.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/archives/my_archives.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/doctor_related/doctor_info.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/doctor_related/info_write.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/doctor_related/select_doctor.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/book.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/mine.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/order.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/payment.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/coupon/coupon.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/service_packs/choicepacks.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/service_packs/introduce.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/service_packs/packs_details.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/service_packs/packs_information.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-back-top/u-back-top.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-card/u-card.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-cell-group/u-cell-group.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-cell-item/u-cell-item.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-column-notice/u-column-notice.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-dropdown-item/u-dropdown-item.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-dropdown/u-dropdown.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-gap/u-gap.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-grid-item/u-grid-item.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-grid/u-grid.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-image/u-image.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-line/u-line.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading/u-loading.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loadmore/u-loadmore.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-notice-bar/u-notice-bar.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-picker/u-picker.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-radio-group/u-radio-group.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-radio/u-radio.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-rate/u-rate.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-read-more/u-read-more.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-row-notice/u-row-notice.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-search/u-search.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-section/u-section.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-select/u-select.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-steps/u-steps.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tag/u-tag.js.map


+ 2 - 1
unpackage/dist/dev/mp-weixin/app.json

xqd
@@ -69,5 +69,6 @@
   "uniStatistics": {
     "enable": false
   },
-  "usingComponents": {}
+  "usingComponents": {},
+  "sitemapLocation": "sitemap34.json"
 }

+ 4 - 2
unpackage/dist/dev/mp-weixin/pages/order/order.wxss

xqd xqd
@@ -35,7 +35,9 @@
 .card .card_img {
   height: 40%;
   width: 100%;
-  display: inline-block;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
   -webkit-box-pack: center;
   -webkit-justify-content: center;
           justify-content: center;
@@ -68,7 +70,7 @@
 .card .describe {
   height: 35%;
   width: 100%;
-  display: inline-block;
+  display: block;
   text-align: center;
 }
 .card .describe view {

+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/personal/coupon/coupon_details.wxss

xqd
@@ -0,0 +1 @@
+/* pages/personal/coupon/coupon_details.wxss */

+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/personal/personal_information.wxss

xqd
@@ -0,0 +1 @@
+/* pages/personal/personal_information.wxss */

+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/service_packs/choicepacks.js

xqd
@@ -159,7 +159,6 @@ __webpack_require__.r(__webpack_exports__);
 //
 var _default =
 {
-  name: 'productdetailspage',
   data: function data() {
     return {
       array: [{

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/service_packs/choicepacks.wxml

xqd
@@ -1 +1 @@
-<view style="width:100vw;height:auto;padding:30rpx 20rpx;background-color:#f6f6f6;"><view style="width:100%;height:100%;"><text style="font-size:30rpx;font-weight:bold;">官方套餐</text><block wx:for="{{array}}" wx:for-item="item" wx:for-index="index"><view><view class="card"><view data-event-opts="{{[['tap',[['details',['$event']]]]]}}" class="taocan" bindtap="__e"><view class="tc_left"><text>{{item.title}}</text></view><view class="tc_right"><view style="width:100%;"><view class="text">{{item.describe1}}</view><view class="text">{{item.describe2}}</view><view class="text"><text style="text-align:left;">{{"时长:"+item.time}}</text><text style="float:right;color:#FF4F61;font-weight:bold;">{{"¥"+item.price}}</text></view></view></view></view></view></view></block></view></view>
+<view style="width:100vw;height:auto;padding:30rpx 20rpx;background-color:#f6f6f6;"><view style="width:100%;height:100%;"><text style="font-size:30rpx;font-weight:bold;">官方套餐</text><block wx:for="{{array}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view><view class="card"><view data-event-opts="{{[['tap',[['details',['$event']]]]]}}" class="taocan" bindtap="__e"><view class="tc_left"><text>{{item.title}}</text></view><view class="tc_right"><view style="width:100%;"><view class="text">{{item.describe1}}</view><view class="text">{{item.describe2}}</view><view class="text"><text style="text-align:left;">{{"时长:"+item.time}}</text><text style="float:right;color:#FF4F61;font-weight:bold;">{{"¥"+item.price}}</text></view></view></view></view></view></view></block></view></view>

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/service_packs/introduce.wxml

xqd
@@ -1 +1 @@
-<view class="container"><view class="body"><image class="img" src="../../static/占位图.png"></image></view><view class="footer"><view class="cu-bar bg-white tabbar border shop" style="width:100%;"><button class="action" style="width:33%;" open-type="contact"><view class="cuIcon-service text-green"></view>客服</button><view data-event-opts="{{[['tap',[['next',['$event']]]]]}}" class="submit" style="background-color:#0B73B9;color:#FFFFFF;" bindtap="__e">选购服务包</view></view></view></view>
+<view class="container"><view class="body"><image class="img" src="../../static/占位图.png"></image></view><view class="footer"><view class="cu-bar bg-white tabbar border shop" style="width:100%;"><button class="action" style="width:33%;" open-type="contact"><view class="cuIcon-service text-green"></view>客服</button><view data-event-opts="{{[['tap',[['next',['$event']]]]]}}" class="submit" style="background-color:#0B73B9;color:#FFFFFF;" bindtap="__e">选购服务包</view></view></view></view>

+ 169 - 1
unpackage/dist/dev/mp-weixin/pages/service_packs/packs_details.js

xqd xqd
@@ -127,8 +127,60 @@ __webpack_require__.r(__webpack_exports__);
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/.swdz/uni-app/baoma/mabao/pages/service_packs/packs_details.vue?vue&type=script&lang=js& ***!
   \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
-/***/ (function(module, exports) {
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -158,6 +210,122 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+var _default =
+{
+  name: 'productdetailspage',
+  data: function data() {
+    return {
+      //协议
+      num: 1,
+      imgitem: {
+        istrue: false,
+        name: "../../static/img/xieyi.png" },
+
+      tcID: '套餐一', //ID
+      tcTime: '一年', //套餐有效期
+      tcContent: { //套餐内容
+        content: '套餐一包含包含疫苗接种、门诊预约、儿保预约三项服务', //内容
+        scope: '使用范围:家医团队可用,有效期内无限次、300元额度以内门诊预约与儿保预约无限制', //范围
+        giving: '赠送XXXX保险:保险介绍' //赠送
+      },
+      tcTeam: [{
+        id: '1',
+        name: '熊大',
+        label1: '熊',
+        label2: '主角',
+        department1: '外科',
+        department2: '主任医师' },
+      {
+        id: '1',
+        name: '熊二',
+        label1: '熊',
+        label2: '主角',
+        department1: '外科',
+        department2: '主任医师' },
+      {
+        id: '1',
+        name: '光头强',
+        label1: '人',
+        label2: '主角',
+        department1: '外科',
+        department2: '主任医师' },
+      {
+        id: '1',
+        name: '李老板',
+        label1: '人',
+        label2: '配角',
+        department1: '外科',
+        department2: '主任医师' },
+      {
+        id: '1',
+        name: '吉吉国王',
+        label1: '猴子',
+        label2: '配角',
+        department1: '外科',
+        department2: '主任医师' },
+      {
+        id: '1',
+        name: '毛毛',
+        label1: '猴子',
+        label2: '配角',
+        department1: '外科',
+        department2: '主任医师' },
+      {
+        id: '1',
+        name: '蹦蹦',
+        label1: '猴子',
+        label2: '配角',
+        department1: '外科',
+        department2: '主任医师' }],
+
+      packs: {
+        id: '', //ID
+        name: '', //名称
+        intro: '', //简介
+        desc: '', //详细介绍
+        price: '', //价格(单位分)
+        team_id: '', //医生团队ID
+        phone_minutes: '', //电话分钟数
+        chat_num: '', //图文咨询次数
+        appoint_num: '', //门诊预约次数
+        vaccine_limit_amount: '', //疫苗总金额限制
+        nurses_limit_amount: '', //儿保总金额限制
+        effective_days: '', //有效天数
+        created_at: '', //创建时间
+        updated_at: '' //更新时间
+      } };
+
+  },
+  methods: {
+    //关注
+    follow: function follow(e) {
+
+    },
+    isqueren: function isqueren() {
+      this.num++;
+      if (this.num % 2 == 0) {
+        this.imgitem.name = "../../static/img/xieyixuan.png";
+        this.imgitem.istrue = true;
+
+      } else {
+        this.imgitem.name = "../../static/img/xieyi.png";
+        this.imgitem.istrue = false;
+      }
+    },
+    next: function next(e) {
+      if (this.imgitem.istrue == false) {
+        uni.showToast({
+          icon: 'none',
+          position: 'bottom',
+          title: '请先同意《协议》' });
+
+      } else {
+        uni.navigateTo({
+          url: '/pages/service_packs/packs_information' });
+
+      }
+    } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
 

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/service_packs/packs_details.wxml


+ 110 - 7
unpackage/dist/dev/mp-weixin/pages/service_packs/packs_details.wxss

xqd xqd xqd
@@ -34,7 +34,7 @@
   bottom: 0;
 }
 .round {
-  height: 50rpx;
+  height: 45rpx;
   width: 50rpx;
   -webkit-border-radius: 50%;
           border-radius: 50%;
@@ -45,13 +45,13 @@
   -webkit-box-sizing: border-box;
           box-sizing: border-box;
 }
-.card view {
+.card .card_view {
   width: 100%;
   background-color: #ffffff;
   -webkit-border-radius: 15rpx;
           border-radius: 15rpx;
 }
-.card view .title {
+.card .card_view .title {
   width: 100%;
   height: 20vh;
   display: -webkit-box;
@@ -64,12 +64,115 @@
   -webkit-align-items: flex-end;
           align-items: flex-end;
 }
-.card view .title .img {
-  width: 85%;
+.card .card_view .title .img {
+  width: 90%;
   height: 90%;
 }
-.card view .describe {
+.card .card_view .describe {
   width: 100%;
-  height: 80vh;
+  height: 1;
+  padding: 100rpx 40rpx 20rpx 40rpx;
+}
+.list {
+  margin: 20rpx 0 10rpx 0;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  width: 100%;
+  height: 200rpx;
+  -webkit-border-radius: 15rpx;
+          border-radius: 15rpx;
+  background-color: #FFFFFF;
+  -webkit-box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.08);
+          box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.08);
+}
+.list .portrait {
+  width: 30%;
+  height: 100%;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+          justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+}
+.list .portrait .img {
+  width: 100rpx;
+  height: 100rpx;
+  -webkit-border-radius: 50%;
+          border-radius: 50%;
+}
+.list .portrait .bun {
+  text-align: center;
+  width: 80rpx;
+  height: 36rpx;
+  background-color: #D92975;
+  margin: 0 10rpx;
+  -webkit-border-radius: 60rpx;
+          border-radius: 60rpx;
+  position: relative;
+  top: -20rpx;
+  font-size: 20rpx;
+  color: #FFFFFF;
+  padding: 3rpx 0;
+}
+.list .text {
+  width: 70%;
+  height: 100%;
+  padding: 20rpx 0;
+}
+.list .text .name {
+  font-size: 30rpx;
+  font-weight: bold;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+}
+.list .text .name .label {
+  font-weight: 400;
+  margin-right: 15rpx;
+  background-color: #E5F5FF;
+  color: #0B73B9;
+  width: 100rpx;
+  height: 28rpx;
+  font-size: 20rpx;
+  -webkit-border-radius: 10rpx;
+          border-radius: 10rpx;
+  text-align: center;
+}
+.list .text .department {
+  padding: 20rpx 0;
+  color: #666666;
+}
+.list .text .department text {
+  margin-right: 15rpx;
+}
+.list .text .option {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+}
+.list .text .option view {
+  background-color: #E4E4E4;
+  width: 100rpx;
+  height: 48rpx;
+  -webkit-border-radius: 12px;
+          border-radius: 12px;
+  margin-right: 15rpx;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+          justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
 }
 

+ 29 - 2
unpackage/dist/dev/mp-weixin/project.config.json

xqd xqd
@@ -6,13 +6,40 @@
   "setting": {
     "urlCheck": false,
     "es6": true,
+    "enhance": false,
     "postcss": false,
-    "minified": true
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "useMultiFrameRuntime": false,
+    "useApiHook": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": []
   },
   "compileType": "miniprogram",
   "libVersion": "",
   "appid": "wx92066f7587c34617",
   "projectname": "mabao",
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
   "condition": {
     "search": {
       "current": -1,
@@ -32,7 +59,7 @@
         {
           "name": "介绍",
           "id": 0,
-          "pathName": "pages/service_packs/packs_details"
+          "pathName": "pages/service_packs/introduce"
         }
       ]
     }

+ 7 - 0
unpackage/dist/dev/mp-weixin/sitemap17.json

xqd
@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}

+ 7 - 0
unpackage/dist/dev/mp-weixin/sitemap34.json

xqd
@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}

+ 7 - 0
unpackage/dist/dev/mp-weixin/sitemap52.json

xqd
@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}

BIN=BIN
unpackage/dist/dev/mp-weixin/static/img/xieyi.png


BIN=BIN
unpackage/dist/dev/mp-weixin/static/img/xieyixuan.png


BIN=BIN
unpackage/dist/dev/mp-weixin/static/头像.png


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio