9-30-1

manifest.json

@@ -80,7 +80,7 @@
     },
     "h5" : {
         "title" : "江陵县红十字会",
-        "domain" : "red.liuniu946.com",
+        "domain" : "admin.jzrc.org.cn",
         "router" : {
             "mode" : "hash",
             "base" : "/index/"
@@ -88,7 +88,7 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://red.liuniu946.com", //请求的目标域名
+                    "target" : "http://admin.jzrc.org.cn", //请求的目标域名
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {}

pages.json

@@ -144,7 +144,7 @@
 				// #endif
 				"navigationBarBackgroundColor": "#457DBF",
 				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "孝感红十字会安心捐赠"
+				"navigationBarTitleText": "我的捐款"
 			}
 		},
 		{

pages/applic/contribution.vue

@@ -59,7 +59,7 @@
 		<!-- <view class="infoOptional">
 			信息(选填)
 		</view> -->
-		<view class="box">
+		<view class="box" v-if="public">
 			<view class="box-item">
 				<view class="box-left">
 					<view v-if="!is_show">
@@ -406,23 +406,25 @@
 					this.$api.msg('请输入捐款金额！');
 					return;
 				}
-				if (this.is_show) {
-					if (!obj.donate_er) {
-						this.$api.msg('请填写您的单位');
-						return;
+				if(this.public) {
+					if (this.is_show) {
+						if (!obj.donate_er) {
+							this.$api.msg('请填写您的单位');
+							return;
+						}
+					} else {
+						if (!obj.donate_er) {
+							this.$api.msg('请填写您的姓名');
+							return;
+						}
 					}
-				} else {
-					if (!obj.donate_er) {
-						this.$api.msg('请填写您的姓名');
+					
+					const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
+					if (!reg.test(obj.mobile)) {
+						obj.$api.msg('请填写正确的手机号码');
 						return;
 					}
 				}
-
-				const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
-				if (!reg.test(obj.mobile)) {
-					obj.$api.msg('请填写正确的手机号码');
-					return;
-				}
 				if (this.is_receipts == '0') {
 					// obj.address = '用户未填写联系地址'
 					if (!obj.address) {
@@ -443,7 +445,7 @@
 				let updata = {
 					// category_id: obj.category_id, //捐款意向id
 					amount: obj.money, //捐款金额
-					name: obj.donate_er, //捐款人/单位
+					name: obj.donate_er || '佚名', //捐款人/单位
 					// contact: obj, //单位联系人（企业有效）
 					tel: obj.mobile, //手机号
 					address: obj.address, //联系地址

pages/applic/science.vue

@@ -12,7 +12,7 @@
 		</view>
 		<view class="list-box" v-for="(item,index) in science" :key='index' @click="Jump(item.id)">
 			<view class="box-left">
-				<image :src="$store.state.baseURL + item.image" mode="" class="left-img"></image>
+				<image :src="(item.image.indexOf('http') != -1 )? item.image: ($store.state.baseURL + item.image)" mode="" class="left-img"></image>
 			</view>
 			<view class="box-right">
 				<view class="right-top word1_ellipsis">
@@ -70,7 +70,7 @@
 			},
 			loadData(){
 				let obj = this;
-				getArticList({ifyid:62}).then(({ data }) => {
+				getArticList({ifyid:55}).then(({ data }) => {
 					console.log(data,123456);
 					obj.science = obj.science.concat(data.list);
 					console.log(obj.science,'999999999999999999')

pages/applic/toknowledge.vue

@@ -44,7 +44,7 @@
 					<view class="name">怎样成为造血干细胞志愿捐献者？？</view>
 				</view>
 				<view class="list-tpl">
-					您可与神农架林区红十字会联系，或在余姚市爱心献血屋（阳明西路桐江桥街心公园内）报名。到指定地点抽取6-8毫升血液，经HLA分型检验，把相关资料录入到中华骨髓库的数据库中，这样您就成为造血干细胞志愿捐献者了。
+					您可与{{$store.state.baseName}}联系报名。到指定地点抽取6-8毫升血液，经HLA分型检验，把相关资料录入到中华骨髓库的数据库中，这样您就成为造血干细胞志愿捐献者了。
 				</view>
 			</view>
 			<view class="list-item">

pages/cart/personal.vue

@@ -236,55 +236,62 @@ export default {
 				.then(e => {
 					// uni.navigateTo({
 					// 	url: '../joinSuc/joinNow'
-					// });
-					uni.showModal({
-						title: '提示',
-						content: '成为个人会员需要缴纳' + obj.money + '元年费，是否前往提交',
-						success: function(res) {
-							if (res.confirm) {
-								console.log('用户点击确定');
-								createOrder({
-									level_id: obj.id,
-									body: '个人红会年费',
-									pay_type: 0,
-									// name: obj.name,
-									pay_price: obj.money,
-									from: 'weixin'
-								}).then(({data}) =>{
-									obj.name = '';
-									obj.sex = '';
-									obj.educationid = '';
-									obj.birth = '';
-									(obj.mz = ''), (obj.phone = '');
-									obj.address = '';
-									obj.work = '';
-									obj.specialty = '';
-									(obj.cardimg = ''), (obj.card = '');
-									let res = data.jsConfig;
-									console.log(res)
-									obj.weichatObj.chooseWXPay({
-										timestamp: res.timestamp,
-										nonceStr: res.nonceStr,
-										package: res.package,
-										signType: res.signType,
-										paySign: res.paySign,
-										success: function(res) {
-											uni.navigateTo({
-												url: '../joinSuc/joinNow'
-											});
-										},
-										fail: function(res) {
-											this.$refs.popup1.open()
-											console.log(res, "失败")
-											console.log(res.errMsg)
-										}
-									});
-								})
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
+					// });
+					if(obj.money) {
+						uni.showModal({
+							title: '提示',
+							content: '成为个人会员需要缴纳' + obj.money + '元年费，是否前往提交',
+							success: function(res) {
+								if (res.confirm) {
+									console.log('用户点击确定');
+									createOrder({
+										level_id: obj.id,
+										body: '个人红会年费',
+										pay_type: 0,
+										// name: obj.name,
+										pay_price: obj.money,
+										from: 'weixin'
+									}).then(({data}) =>{
+										obj.name = '';
+										obj.sex = '';
+										obj.educationid = '';
+										obj.birth = '';
+										(obj.mz = ''), (obj.phone = '');
+										obj.address = '';
+										obj.work = '';
+										obj.specialty = '';
+										(obj.cardimg = ''), (obj.card = '');
+										let res = data.jsConfig;
+										console.log(res)
+										obj.weichatObj.chooseWXPay({
+											timestamp: res.timestamp,
+											nonceStr: res.nonceStr,
+											package: res.package,
+											signType: res.signType,
+											paySign: res.paySign,
+											success: function(res) {
+												uni.navigateTo({
+													url: '../joinSuc/joinNow'
+												});
+											},
+											fail: function(res) {
+												this.$refs.popup1.open()
+												console.log(res, "失败")
+												console.log(res.errMsg)
+											}
+										});
+									})
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+							}
+						});
+					}else {
+						uni.navigateTo({
+							url: '../joinSuc/joinNow'
+						});
+					}
+					
 				})
 				.catch(function(e) {
 					console.log('出错了');

pages/form/donaSuccess.vue

@@ -167,7 +167,7 @@ export default {
 	onLoad(option) {
 		console.log(333, option);
 		this.money = option.money;
-		this.name = decodeURI(option.name)
+		this.name = decodeURI(option.name) || '佚名'
 		this.add_time =decodeURI(option.time)
 		this.IndexShare();
 		this.ScanAudio(true);

pages/index/index.vue

@@ -156,7 +156,7 @@
 						<view class="list-left">
 							<view class="info">
 								<view class="title">{{ item.name }}</view>
-								<view class="addr">地址：{{ item.install_address }}</view>
+								<view class="addr">地址：{{ item.address }}</view>
 							</view>
 						</view>
 						<view class="image">

store/index.js

@@ -5,10 +5,10 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		// #ifdef MP
-		baseURL: 'http://gongan.igxys.com', //请求地址配置
+		baseURL: 'http://jlxwx.jzrc.org.cn', //请求地址配置
 		// #endif
 		// #ifndef MP
-		baseURL: 'http://gongan.igxys.com', //请求地址配置
+		baseURL: 'http://jlxwx.jzrc.org.cn', //请求地址配置
 		// #endif
 		// baseURL: 'http://yrh.liuniu946.com', //请求地址配置
 		urlFile: '/index', //项目部署所在文件夹
@@ -23,8 +23,8 @@ const store = new Vuex.Store({
 		// #endif
 		// shareData:'',//分享信息
 		project_area: 0,
-		sys_appid: 'gonganxianred2022125',//系统AppID
-		sys_appsecret: '2022125gonganxianred',//系统AppSecret
+		sys_appid: 'jlx2022224',//系统AppID
+		sys_appsecret: '2022224jlx',//系统AppSecret
 		baseName: '江陵县红十字会',
 		shareDesc: '弘扬红十字精神，传播红十字观念，宣传红十字工作，这是一个汇聚爱心、救助之家力量的平台！'
 	},