add

common/request.js

@@ -5,9 +5,8 @@ export default class Request {
 		// let path = 'http://127.0.0.1:8113';
 		// var path=uni.getStorageSync('requestPath')
 
-		// var path = 'https://storeuserapp.bjyjbao.com'; //正式
-		var path = "http://eb6a8378.natappfree.cc"
-		// var path = "http://q8956b49.natappfree.cc"
+		var path = 'https://storeuserapp.bjyjbao.com'; //正式
+		// var path = "http://kd8f396b.natappfree.cc"
 		// var path = "http://192.168.10.126:8113"
 		let token="";
 		let type = 0

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "医健宝医药",
+    "name" : "互易享",
     "appid" : "__UNI__0B04737",
     "description" : "",
     "versionName" : "1.0.0",

note.txt

@@ -12,7 +12,7 @@ wx73f85f8d62769119
 御君方互联网医院
 彩虹惠医互联网医院
 wxd8a9a602e7ddc4ba
-医健宝医药
+互易享
 
 云联测试
 wx6535a9714d7e4e67

pages.json

@@ -7,7 +7,7 @@
 		{
 			"path": "pages/common/launch",
 			"style": {
-				"navigationBarTitleText": "医健宝医药",
+				"navigationBarTitleText": "互易享",
 				"navigationBarTextStyle": "black",
 				"navigationBarBackgroundColor": "#ffffff"
 			}
@@ -25,7 +25,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTextStyle": "black",
-				"navigationBarTitleText": "医健宝医药",
+				"navigationBarTitleText": "互易享",
 		        "enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			
@@ -35,7 +35,7 @@
 			"path": "pages/shopping/index",
 			"style": {
 				"navigationBarTextStyle": "black",
-				"navigationBarTitleText": "医健宝医药",
+				"navigationBarTitleText": "互易享",
 		        "enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			
@@ -2339,7 +2339,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
-		"navigationBarTitleText": "医健宝医药",
+		"navigationBarTitleText": "互易享",
 		"navigationBarBackgroundColor": "#2583EB",
 		"backgroundColor": "#ffffff"
 	},

pages/auth/login.vue

@@ -6,7 +6,7 @@
 					<view class="logo-img">
 						<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/logo.png"></image>
 					</view>
-					<view class="title">医健宝医药</view>
+					<view class="title">互易享</view>
 				</view>
 				<view class="login-notice">为了提供更优质的服务，请先登录</view>
 				<view class="btns">

pages/index/index.vue

@@ -7,7 +7,7 @@
 			<view class="top-box" :style="{ background: bg }" >
 				<view class="status_bar" :style="{height: statusBarHeight}"></view>
 				<view class="top-title">
-					<view class="name" :style="{ color: titleColor }">医健宝医药</view>
+					<view class="name" :style="{ color: titleColor }">互易享</view>
 				</view>
 			
 				<view class="search">
@@ -379,7 +379,7 @@
 		onShareAppMessage(res) {
 			if(this.$isLogin()){
 				return {
-					title: "医健宝医药",
+					title: "互易享",
 					path: '/pages/index/index',
 					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
@@ -390,7 +390,7 @@
 		onShareTimeline(res) {
 			if(this.$isLogin()){
 				return {
-					title: "医健宝医药",
+					title: "互易享",
 					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}

pages/index/indexOld.vue

@@ -7,7 +7,7 @@
 			<view class="top-box" :style="{ background: bg }" >
 				<view class="status_bar" :style="{height: statusBarHeight}"></view>
 				<view class="top-title">
-					<view class="name" :style="{ color: titleColor }">医健宝医药</view>
+					<view class="name" :style="{ color: titleColor }">互易享</view>
 					<view class="desc-box" >
 						<image v-if="!isTop" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/dui1.png"></image>
 						<image v-if="isTop" src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/shop/image/dui1.png"></image>
@@ -349,7 +349,7 @@
 		onShareAppMessage(res) {
 			if(this.$isLogin()){
 				return {
-					title: "医健宝医药",
+					title: "互易享",
 					path: '/pages/index/index',
 					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
@@ -360,7 +360,7 @@
 		onShareTimeline(res) {
 			if(this.$isLogin()){
 				return {
-					title: "医健宝医药",
+					title: "互易享",
 					imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}

pages_company/order/confirmCompanyOrder.vue

@@ -83,7 +83,7 @@
 				</template>
 			</view>
 		</view>
-		<modal v-if="inputShow" title="实收金额" confirm-text="保存" cancel-text="取消" @cancel="cancelUpdateMoney" @confirm="confirmUpdateMoney">
+		<modal v-if="inputShow" title="实收金额" confirm-text="保存" cancel-text="取消" @cancel="cancelUpdateMoney" @confirm="confirm">
 			<input type="text" v-model="inputTxt" placeholder="请输入实收金额" class="intxt" maxlength="8" />
 		</modal>
 	</view>
@@ -155,7 +155,7 @@
 		//发送给朋友
 		onShareAppMessage(res) {
 			return {
-				title: "医健宝医药",
+				title: "互易享",
 				path: '/pages_company/order/confirmOrder?orderKey='+this.orderKey+'&companyUserId='+this.companyUserId+"&dataKey="+this.dataKey,
 				imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
@@ -182,22 +182,34 @@
 					addressId:this.addressId,
 					companyUserId:uni.getStorageSync('companyUserId')
 				}
+				this.saveCacheAddress(param)
+			},
+			saveCacheAddress(param,type) {
+				uni.showLoading({
+					title: '保存中'
+				})
 				salesVoucherCacheAddress(param).then(res=>{
+					uni.hideLoading()
 					if(res.code ==200) {
 						this.dataKey = res.dataKey
-						if(this.isPrescribe) {
-							uni.navigateTo({
-								url: '/pages_company/order/editUserOrderPrescribe?orderKey='+this.orderKey+'&companyUserId='+this.companyUserId+"&dataKey="+this.dataKey+'&answerMedicine='+encodeURIComponent(JSON.stringify(this.answerMedicine)),
-							})
+						if(type==1) {
+							this.confirmUpdateMoney()
 						} else {
-							uni.showToast({
-								title: '提交成功，去分享吧',
-								icon: 'none'
-							})
-							this.dataKey = res.dataKey
-							this.disabled = false
-							uni.showShareMenu()
+							if(this.isPrescribe) {
+								uni.navigateTo({
+									url: '/pages_company/order/editUserOrderPrescribe?orderKey='+this.orderKey+'&companyUserId='+this.companyUserId+"&dataKey="+this.dataKey+'&answerMedicine='+encodeURIComponent(JSON.stringify(this.answerMedicine)),
+								})
+							} else {
+								uni.showToast({
+									title: '提交成功，去分享吧',
+									icon: 'none'
+								})
+								this.dataKey = res.dataKey
+								this.disabled = false
+								uni.showShareMenu()
+							}
 						}
+						
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -245,12 +257,35 @@
 			cancelUpdateMoney(){
 				this.inputShow = false
 			},
+			confirm() {
+				// if(parseFloat(this.inputTxt)>0){
+				// 	if(this.addressId) {
+				// 		const param = {
+				// 			addressId:this.addressId,
+				// 			companyUserId:uni.getStorageSync('companyUserId')
+				// 		}
+				// 		this.saveCacheAddress(param,1)
+				// 	} else {
+				// 		this.confirmUpdateMoney()
+				// 	}
+				// } else {
+				// 	uni.showToast({
+				// 		icon:'none',
+				// 		title: "价格应大于0",
+				// 	});
+				// }
+				this.confirmUpdateMoney()
+			},
 			confirmUpdateMoney(){
 				if(parseFloat(this.inputTxt)>0){
 					var that=this;
 					var data={totalAmount: this.price.totalPrice,createOrderKey:this.orderKey,token:uni.getStorageSync('CompanyUserToken'),money:this.inputTxt}
+					uni.showLoading({
+						title: '保存中'
+					})
 					updateSalseOrderMoney(data).then(
 						res => {
+							uni.hideLoading()
 							if(res.code==200){
 								this.auditMoney = res.disabled
 								const canShare = !!(this.addressId && !res.disabled);

pages_company/order/editUserOrderPrescribe.vue

@@ -254,7 +254,7 @@
 		},
 		onShareAppMessage(res) {
 			return {
-				title: "医健宝医药",
+				title: "互易享",
 				path: '/pages_company/order/confirmOrder?orderKey='+this.orderKey+'&companyUserId='+this.companyUserId+"&dataPrescribeKey="+this.dataPrescribeKey+'&dataKey='+this.dataKey,
 				imageUrl: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/sharelogo.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
@@ -506,7 +506,8 @@
 					patientId:this.patientId,
 					userId: this.companyUserId,// 销售填写传销售
 					relationship, // 1-本人，2-父母，3-配偶，4-子女，5-其他
-					beforeAiDataList
+					beforeAiDataList,
+					patientInfo:JSON.stringify(this.patientInfo)
 				}
 				uni.showLoading({
 					title:"正在处理中"

pages_order/inquiryForm2_1.vue

@@ -433,7 +433,7 @@
 			}); 
 			//禁止二次转发--end
 			return {
-				title: "医健宝医药--咨询",
+				title: "互易享--咨询",
 				path: "/pages_order/inquiryForm2_1?inquiryType=2&orderType=2&inquirySubType="+this.inquirySubType+"&companyId="+this.companyId+"&companyUserId="+this.companyUserId
 			}
 			

pages_order/inquiryForm2_2.vue

@@ -403,7 +403,7 @@
 				fail() {}
 			}); //禁止二次转发--end
 			return {
-				title: "医健宝医药--咨询",
+				title: "互易享--咨询",
 				path: "/pages_order/inquiryForm2_2?inquiryType=2&orderType=2&inquirySubType="+this.inquirySubType+"&companyId="+this.companyId+"&companyUserId="+this.companyUserId
 			}
 			

pages_order/inquirySelect.vue

@@ -89,7 +89,7 @@
 				fail() {}
 			}); //禁止二次转发--end
 			return {
-				title: "医健宝医药--咨询",
+				title: "互易享--咨询",
 				path: "/pages_order/inquirySelect?inquiryType=3&companyId="+this.companyId+"&companyUserId="+this.companyUserId
 			}
 			

pages_shopping/confirmCreateOrder.vue

@@ -517,7 +517,7 @@
 										it => it.order.id)
 									orderIds = orderIds.join(',')
 									uni.redirectTo({
-										url: "/pages_shopping/prescribe?orderId=" + orderIds+"&dataPrescribeKey="+"&companyUserId="+that.companyUserId+that.dataPrescribeKey +"&dataKey="+that.dataKey+"&combinationOrderId=" + encodeURIComponent(res.data[0].order.combinationOrderId)
+										url: "/pages_shopping/prescribe?orderId=" + orderIds+"&dataPrescribeKey="+that.dataPrescribeKey+"&companyUserId="+that.form.companyUserId +"&dataKey="+that.dataKey+"&combinationOrderId=" + encodeURIComponent(res.data[0].order.combinationOrderId)
 									})
 								}, 200);
 							} else {

pages_shopping/paymentOrder.vue

@@ -55,7 +55,8 @@
 							<radio  :value="2" :checked="order.payType=='2'" />
 						</label>
 					</view>
-					<view class="item" v-if="user!=null&&user.level==1 ">
+					<!-- v-if="user!=null&&user.level==1 " 2026.2.9注释-->
+					<view class="item">
 						<view class="left">
 							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/pay_1.png" mode=""></image>
 							<text class="text">货到付款</text>
@@ -84,7 +85,8 @@
 							<radio  :value="2" :checked="order.payType=='2'" />
 						</label>
 					</view>
-					<view class="item" v-if="user!=null&&user.level==1 ">
+					<!-- v-if="user!=null&&user.level==1 " 2026.2.9注释-->
+					<view class="item">
 						<view class="left">
 							<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/shopping/pay_1.png" mode=""></image>
 							<text class="text">货到付款</text>

pages_shopping/prescribe.vue

@@ -263,7 +263,6 @@
 			} else {
 				this.selectOrderPrescription()
 			}
-			this.getPatientList();
 			uni.$on('refreshPatient', () => {
 				this.getPatientList()
 			})
@@ -271,14 +270,14 @@
 			this.diseaseQueryList()
 		},
 		onShow() {
-			this.getPatientList();
+			// this.getPatientList();
 		},
 		
 		methods: {
 			// 根据dataKey查询处方填写信息
 			getSquareInformation() {
 				const param = {
-					userId: companyUserId,
+					userId: this.companyUserId,
 					dataKey: this.dataPrescribeKey
 				}
 				uni.showLoading({
@@ -290,8 +289,14 @@
 						this.imgList = res.data.imgList ? res.data.imgList.split(','):[];
 						const str = res.data.beforeAiDataList.find(v => v.subjectId === 1)?.answer || '';
 						this.activeDise = str.split(',').filter(Boolean); // 去掉空元素
-						// 例：["急性上呼吸道感染"]
+						this.isLactation = res.data.isLactation || 0
+						this.isPregnantWoman = res.data.isPregnantWoman || 0
+						this.quesList[0].answer = res.data.beforeAiDataList.find(v => v.subjectId === 4)?.answer
+						this.quesList[1].answer = res.data.beforeAiDataList.find(v => v.subjectId === 5)?.answer
+						this.patientInfo = res.data.patientInfo ? JSON.parse(res.data.patientInfo):{}
+						this.patientId = res.data.patientId
 						this.getStoreOrderById();
+						this.getPatientList();
 					} else {
 						uni.showToast({
 							icon:'none',
@@ -309,8 +314,8 @@
 				}
 				cacheOrderPrescription(param).then(res=>{
 					if(res.code==200) {
-						this.imgList = res.data.imgList ? res.data.imgList.split(','):[];
-						this.activeDise =  res.data.beforeAiDataList
+						// this.imgList = res.data.imgList ? res.data.imgList.split(','):[];
+						// this.activeDise =  res.data.beforeAiDataList
 					} else {
 						uni.showToast({
 							icon:'none',
@@ -330,9 +335,15 @@
 				selectOrderPrescription(param).then(res=>{
 					uni.hideLoading()
 					if(res.code==200) {
-						this.dataPrescribeKey = res.data.dataKey || ''
-						if(this.dataPrescribeKey) {
-							this.getSquareInformation()
+						if(res.dataKey) {
+							this.dataPrescribeKey = res.dataKey.dataKey || ''
+							this.companyUserId =  res.dataKey.companyUserId || ''
+							if(this.dataPrescribeKey) {
+								this.getSquareInformation()
+							}
+						} else {
+							this.getStoreOrderById();
+							this.getPatientList();
 						}
 					} else {
 						uni.showToast({
@@ -491,7 +502,6 @@
 				})
 			},
 			submit(){
-				console.log('this.isAgreement==',this.isAgreement)
 				if (!this.isAgreement) {
 					uni.showToast({
 						icon: 'none',
@@ -640,6 +650,23 @@
 			 			uni.hideLoading()
 			 			if(res.code==200){
 			 				this.patient=res.data;
+							if(this.patient&&this.patient.length>0) {
+								const existIndex = this.patient.findIndex(
+								    item => item.patientId === this.patientInfo.patientId
+								);
+								
+								if (existIndex === -1) {
+								    // 使用 Vue 的数组变异方法，确保视图更新
+								    this.patient.unshift({ ...this.patientInfo });
+								} else if (existIndex > 0) {
+								    // 已存在但不是第一个，移到最前面
+								    const item = this.patient[existIndex];
+								    this.patient.splice(existIndex, 1);
+								    this.patient.unshift(item);
+								}
+							} else {
+								this.patient = [this.patientInfo]
+							}
 			 			}else{
 			 				uni.showToast({
 			 					icon:'none',

pages_store/storeIndex.vue

@@ -47,17 +47,17 @@
 				<detail class="store-detail" ref="getStoreInfo" :storeInfo="storeInfo"></detail>
 			</view>
 			<view v-if="current==1" class="medic-box">
-				<scroll-view :scroll-y="true" class="cate-list" :style="{top: mescrollTop+'px',height:divHeight}">
+				<view class="cate-list" :style="{top: mescrollTop+'px',height:divHeight}">
 					<view 
 						v-for="(item,index) in cates" 
 						:key="index" 
-						:class="cateSelect == item.dictValue?'item active':'item'" 
+						:class="cateSelect == item.cateId?'item active':'item'" 
 						@click="choseCate(item)"
-					>{{item.dictLabel }}</view>
-				</scroll-view>
+					>{{item.cateName }}</view>
+				</view>
 				<view class="medic">
 					<mescroll-body :top="mescrollTop+'px'" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
-					<view  style="padding: 0 24rpx 0 0;">
+					<view  style="padding-right: 16rpx;">
 						<medicineItem v-for="(item, index) in dataList" :key="index" :item="item" :storeId="storeId"></medicineItem>
 						<!-- <medicineVerticalItem v-for="(item, index) in dataList" :key="index" :item="item" :storeId="storeId"></medicineVerticalItem> -->
 					</view>
@@ -85,7 +85,6 @@
 </template>
 
 <script>
-	import {getDicts} from '@/api/common.js'
 	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 	import tuiStoreProduct from './components/tuiStoreProduct.vue'
 	import qualifications from './components/qualifications.vue'
@@ -125,7 +124,7 @@
 					},
 					{
 						id:2,
-						name:'药品'
+						name:'分类'
 					},
 					{
 						id:3,
@@ -148,7 +147,6 @@
 				upOption: {
 					onScroll:true,
 					use: true, // 是否启用上拉加载; 默认true
-					// auto: false,
 					page: {
 						num: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
 						size: 10 // 每页数据的数量,默认10
@@ -170,7 +168,6 @@
 					productName:"",
 					storeId: "",
 					cateId:'',
-					productType:'',
 					pid:'',
 					storeId: ''
 				},
@@ -190,7 +187,7 @@
 				//小程序的原生菜单中显示分享按钮，才能够让发送给朋友与分享到朋友圈两个按钮可以点击
 				menus:["shareAppMessage","shareTimeline"] //不设置默认发送给朋友
 			})
-			this.getProductType();
+			this.getProductCate();
 			this.getStoreInfo();
 			this.getCommentByUser();
 		},
@@ -262,13 +259,7 @@
 				})
 			},
 			navback() {
-				const pages = getCurrentPages(); // 获取当前页面栈
-				if (pages.length > 1) {
-				  uni.navigateBack({ delta: 1 }); // 有上一页才返回
-				} else {
-				  // 如果是首页，跳转到某个默认页面（如首页）
-				  uni.switchTab({ url: 'pages/index/index' });
-				}
+				uni.navigateBack()
 			},
 			tabChange(item) {
 				this.current=item.index
@@ -353,34 +344,11 @@
 					rej => {}
 				);
 			},
-			getProductType(){
-				let data = {};
-				getDicts(data).then(
-					res => {
-						if(res.code==200){
-							uni.setStorageSync('dicts', JSON.stringify(res));
-							const key = 'storeProductType'
-							let dict=Array.isArray(key) ? key : res[key];
-							this.cates=dict;
-							if(this.cates!=null&&this.cates.length>0){
-								this.cateSelect=this.cates[0].dictValue;
-								this.form.productType = this.cates[0].dictValue;
-								this.mescroll&&this.mescroll.resetUpScroll()
-							}
-						}else{
-							uni.showToast({
-								icon:'none',
-								title: "请求失败",
-							});
-						}
-					},
-					rej => {}
-				);
-			},
 			// 药品分类选择
 			choseCate(item) {
-				this.cateSelect = item.dictValue;
-				this.form.productType = item.dictValue;
+				this.cateSelect = item.cateId;
+				// this.getSubCate()
+				this.form.cateId = item.cateId;
 				this.mescroll.resetUpScroll()
 				
 			},
@@ -399,7 +367,7 @@
 			// 查看药品详情
 			showProductList(item) {
 				uni.navigateTo({
-					url: '/pages_shopping/productList?productType='+item.productType+"&pid="+item.pid+'&storeId='+this.storeId
+					url: '/pages_shopping/productList?cateId='+item.cateId+"&pid="+item.pid+'&storeId='+this.storeId
 				})
 			},
 			goSearch(e) {

pages_user/about.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="logo">
 			<image src="https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com/app/newImages/logo.png"></image>
-			<p>医健宝医药</p>
+			<p>互易享</p>
 		</view>
 		<view class="set-box">
 			<view class="item" @click="callPhone()">