1

manifest.json

@@ -2,8 +2,8 @@
     "name" : "自由天空",
     "appid" : "__UNI__2080341",
     "description" : "自由天空",
-    "versionName" : "1.1.5",
-    "versionCode" : 115,
+    "versionName" : "1.1.6",
+    "versionCode" : 116,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -49,7 +49,16 @@
             "sdkConfigs" : {
                 "ad" : {},
                 "share" : {},
-                "payment" : {}
+                "payment" : {
+                    "alipay" : {
+                        "__platform__" : [ "ios", "android" ]
+                    },
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wx0fd4b616bc7cf3bb",
+                        "UniversalLinks" : ""
+                    }
+                }
             },
             "icons" : {
                 "android" : {

pagesAccount/components/c-drawer.vue

@@ -0,0 +1,110 @@
+<template>
+	<view>
+		<uni-drawer ref="drawerShow" :mode="drawer.mode" :maskClick="true" :width="290" @change="drawerChange">
+			<view class="drawer">
+				<view class="drawer_1">
+					<view class="left textOver">
+						{{drawer.title||'弹窗'}}
+					</view>
+					<view class="right">
+						<uni-icons type="clear" size="30" @tap="toClose()"></uni-icons>
+					</view>
+				</view>
+				<view class="drawer_2">
+					<scroll-view scroll-y="true" class="scroll-view">
+						<view class="list-scroll-view">
+							<view class="info">
+								<slot></slot>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</uni-drawer>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			drawer: {
+				type: Object
+			}
+		},
+		data() {
+			return {};
+		},
+		methods: {
+			drawerChange(e) {
+				const that = this;
+				if (e == false) that.$emit('toClose')
+			},
+			drawerOpen() {
+				const that = this;
+				that.$refs.drawerShow.open();
+			},
+			toClose() {
+				const that = this;
+				that.$emit('toClose')
+			},
+			drawerClose() {
+				const that = this;
+				that.$refs.drawerShow.close();
+			}
+		},
+		watch: {
+			drawer(newVal, oldVal) {
+				const that = this;
+				if (newVal.show == true && oldVal.show == false) that.drawerOpen();
+				else if (newVal.show == false && oldVal.show == true) that.drawerClose();
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.drawer {
+		display: flex;
+		flex-direction: column;
+		width: 77vw;
+		height: 100vh;
+
+		.drawer_1 {
+			display: flex;
+			justify-content: space-between;
+			padding: 2vw;
+
+			.left {
+				flex-grow: 1;
+				font-weight: bold;
+				padding: 1vw 0;
+				font-size: 16px;
+				font-family: monospace;
+			}
+		}
+
+		.drawer_2 {
+			flex-grow: 1;
+			position: relative;
+			padding: 0 2vw;
+
+			.info {
+				padding: 0 2vw;
+			}
+		}
+	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+			padding: 0 !important;
+		}
+	}
+</style>

pagesAccount/vip/index.vue

@@ -29,13 +29,53 @@
 				</checkbox-group>
 			</view>
 		</view>
+		<c-drawer :drawer="drawer" @toClose="toClose">
+			<view class="drawer_one">
+				<uni-forms ref="payForm" :model="payForm" :rules="rules">
+					<uni-forms-item name="type">
+						<view class="label">支付方式</view>
+						<uni-data-checkbox v-model="payForm.type" :localdata="typeList"
+							:map="{text:'label',value:'value'}" @change="typeChange"></uni-data-checkbox>
+					</uni-forms-item>
+					<uni-forms-item>
+						<view class="label">支付图片</view>
+						<view class="img">
+							<image class="image"
+								:src="payForm.img_url&&payForm.img_url.length>0?payForm.img_url[0].url:''"
+								mode="aspectFit" @tap="imgView(payForm.img_url)">
+							</image>
+						</view>
+					</uni-forms-item>
+					<uni-forms-item name="pay_no">
+						<view class="label">转账单号/订单号</view>
+						<uni-easyinput type="number" v-model="payForm.pay_no" placeholder="请输入转账单号/订单号" />
+					</uni-forms-item>
+					<!-- <uni-forms-item name="pay_url">
+						<view class="label">支付账单明细截图</view>
+						<upload :list="payForm.pay_url" name="pay_url" :count="1" @uplSuc="uplSuc" @uplDel="uplDel">
+						</upload>
+					</uni-forms-item> -->
+				</uni-forms>
+				<view class="btn">
+					<button size="mini" @tap="toSave()">提交支付信息</button>
+				</view>
+			</view>
+		</c-drawer>
 	</view>
 </template>
 
 <script>
+	import cDrawer from "../components/c-drawer.vue";
+	import upload from "@/components/upload/index.vue";
 	export default {
+		components: {
+			cDrawer,
+			upload
+		},
 		data() {
 			return {
+				// 基本信息
+				basicInfo: {},
 				// 用户信息
 				userInfo: {},
 				// vip信息
@@ -48,16 +88,73 @@
 				agree: true,
 				// 修改用户信息
 				updateUser: {},
+				// 抽屉
+				drawer: {
+					title: '支付',
+					show: false,
+					mode: 'right'
+				},
+				// 支付信息
+				payForm: {
+					type: '0',
+					img_url: [],
+					pay_url: []
+				},
+				rules: {
+					pay_no: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入转账单号/订单号',
+						}]
+					},
+					pay_url: {
+						rules: [{
+							required: false,
+							errorMessage: '请上传支付账单明细截图',
+						}]
+					}
+				},
+				// 支付方式
+				typeList: [{
+					"value": 0,
+					"text": "微信"
+				}, {
+					"value": 1,
+					"text": "支付宝"
+				}]
 			}
 		},
 		onLoad() {
 			const that = this;
+			// 查询基本信息
+			that.searchBasic();
 			// 查询用户信息
 			that.searchUser();
 			// 查询其他信息
 			that.searchOther();
+
 		},
 		methods: {
+			// 查询基本信息
+			searchBasic() {
+				const that = this;
+				uni.getStorage({
+					key: 'basicInfo',
+					success: (res) => {
+						let data = res.data
+						data.account_btn = data.account_btn.sort((a, b) => {
+							return a.sort - b.sort
+						});
+						that.$set(that, `basicInfo`, data);
+						// 支付方式默认值
+						that.typeChange({
+							detail: {
+								value: '0'
+							}
+						})
+					}
+				})
+			},
 			// 查询用户信息
 			searchUser() {
 				const that = this;
@@ -85,6 +182,7 @@
 				}
 				that.$set(that, `form`, form)
 			},
+
 			// 购买
 			toBuy() {
 				const that = this;
@@ -142,39 +240,62 @@
 
 			},
 			// 支付
-			oneBuy(e) {
+			oneBuy() {
 				const that = this;
-				// uni.requestPayment--支付
-				uni.showModal({
+				that.$set(that, `drawer`, {
 					title: '支付',
-					content: `您确认要支付${e.money}元吗？`,
-					success: function(res) {
-						if (res.confirm) {
-							console.log('确认支付');
-							that.toPay(e)
-						} else if (res.cancel) {
-							console.log('取消支付');
-						}
-					}
-				});
+					show: true,
+					mode: 'right'
+				})
+			},
+			typeChange(e) {
+				const that = this;
+				let basicInfo = that.basicInfo;
+				let value = e.detail.value;
+				if (value == '0') that.$set(that.payForm, `img_url`, basicInfo.pay_info.wx_url)
+				else if (value == '1') that.$set(that.payForm, `img_url`, basicInfo.pay_info.zfb_url)
+			},
+			// 图片保存
+			uplSuc(e) {
+				const that = this;
+				that.$set(that.payForm, `${e.name}`, [...that.payForm[e.name], e.data]);
+			},
+			// 图片删除
+			uplDel(e) {
+				const that = this;
+				let data = that.payForm[e.name];
+				let arr = data.filter((i, index) => index != e.data.index);
+				that.$set(that.payForm, `${e.name}`, arr);
+			},
+			// 提交保存
+			toSave() {
+				const that = this;
+				that.$refs.payForm.validate().then(res => {
+					that.toPay()
+				}).catch(err => {
+					console.log('表单错误信息：', err);
+				})
 			},
 			// 确认支付
-			async toPay(e) {
+			async toPay() {
 				const that = this;
 				// 支付成功-修改个人信息，创建支付记录
 				let updateUser = that.updateUser;
-				let form = {
+				let form = that.form;
+				let payForm = that.payForm;
+				let object = {
 					user_id: that.userInfo._id,
 					user_name: that.userInfo.nick_name,
 					money_no: 'NO' + that.$moment().valueOf(),
 					type: 'VIP',
 					create_time: that.$moment().format('YYYY-MM-DD HH:mm:ss'),
-					money: e.money
+					money: form.money,
+					pay_no: payForm.pay_no
 				}
 				let res;
 				res = await that.$api(`user/${updateUser.id}`, 'POST', updateUser);
 				if (res.errcode == '0') {
-					res = await that.$api('moneylog', 'POST', form);
+					res = await that.$api('moneylog', 'POST', object);
 					if (res.errcode == '0') {
 						uni.showToast({
 							title: '开通成功',
@@ -188,7 +309,15 @@
 						})
 					}
 				}
-
+			},
+			// 关闭弹框
+			toClose() {
+				const that = this;
+				that.$set(that, `drawer`, {
+					title: '支付',
+					show: false,
+					mode: 'right'
+				})
 			},
 			// 同意隐私协议
 			changeAgree() {
@@ -220,10 +349,26 @@
 							money: res.data[0].money,
 							days: res.data[0].days
 						}
-						console.log(form);
 						that.$set(that, `form`, form)
 					}
 				}
+				// 支付方式
+				res = await that.$api('dictdata', 'GET', {
+					type: 'app_pay_type'
+				})
+				if (res.errcode == '0') {
+					that.$set(that, `typeList`, res.data)
+				}
+			},
+			// 图片预览
+			imgView(e) {
+				const that = this;
+				console.log(e);
+				console.log(e[0].url);
+				uni.previewImage({
+					current: 0,
+					urls: [e[0].url],
+				});
 			}
 		}
 	}
@@ -305,4 +450,36 @@
 			color: var(--rgbfff);
 		}
 	}
+
+	.drawer_one {
+		.label {
+			font-size: 14px;
+			margin: 0 0 5px 0;
+			font-weight: bold;
+		}
+
+		.img {
+			width: 100%;
+			text-align: center;
+
+			.image {
+				width: 100%;
+			}
+		}
+
+
+		.uni-forms-item {
+			margin: 0;
+		}
+
+		.btn {
+			text-align: center;
+			margin: 30px 0 0 0;
+
+			button {
+				background-color: var(--rgb67c);
+				color: var(--rgbfff);
+			}
+		}
+	}
 </style>

pagesHome/account/index.vue

@@ -33,6 +33,9 @@
 					</view>
 				</view>
 			</view>
+			<view class="thr">
+				<span @tap="toMark(basicInfo.customer_mobile)">客服电话：{{basicInfo.customer_mobile}}</span>
+			</view>
 		</view>
 	</home-frame>
 </template>
@@ -184,6 +187,12 @@
 				else if (e.type == '3') uni.switchTab({
 					url
 				})
+			},
+			// 拨打电话
+			toMark(e) {
+				uni.makePhoneCall({
+					phoneNumber: e
+				})
 			}
 		},
 	};
@@ -191,6 +200,7 @@
 
 <style lang="scss">
 	.main {
+		position: relative;
 		background-color: var(--rgb000);
 		display: flex;
 		flex-direction: column;
@@ -235,7 +245,8 @@
 					-webkit-background-clip: text;
 
 				}
-				.vip{
+
+				.vip {
 					color: var(--rgbffd);
 				}
 
@@ -283,5 +294,14 @@
 				margin: 0 0 10px 0;
 			}
 		}
+
+		.thr {
+			position: absolute;
+			width: 100%;
+			bottom: 5px;
+			text-align: center;
+			color: var(--rgbfff);
+			font-size: 14px;
+		}
 	}
 </style>

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -776,8 +776,8 @@ function populateParameters(result) {
   var parameters = {
     appId: "__UNI__2080341",
     appName: "自由天空",
-    appVersion: "1.1.5",
-    appVersionCode: "115",
+    appVersion: "1.1.6",
+    appVersionCode: "116",
     appLanguage: getAppLanguage(hostLanguage),
     uniCompileVersion: "3.7.3",
     uniRuntimeVersion: "3.7.3",
@@ -875,8 +875,8 @@ var getAppBaseInfo = {
     result = sortObject(Object.assign(result, {
       appId: "__UNI__2080341",
       appName: "自由天空",
-      appVersion: "1.1.5",
-      appVersionCode: "115",
+      appVersion: "1.1.6",
+      appVersionCode: "116",
       appLanguage: getAppLanguage(hostLanguage),
       hostVersion: version,
       hostLanguage: hostLanguage,

unpackage/dist/dev/mp-weixin/pagesAccount/components/c-drawer.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "uni-drawer": "/uni_modules/uni-drawer/components/uni-drawer/uni-drawer",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}

unpackage/dist/dev/mp-weixin/pagesAccount/components/c-drawer.wxss

@@ -0,0 +1,46 @@
+.content {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  width: 100vw;
+  height: 100vh;
+}
+.drawer {
+  display: flex;
+  flex-direction: column;
+  width: 77vw;
+  height: 100vh;
+}
+.drawer .drawer_1 {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw;
+}
+.drawer .drawer_1 .left {
+  flex-grow: 1;
+  font-weight: bold;
+  padding: 1vw 0;
+  font-size: 16px;
+  font-family: monospace;
+}
+.drawer .drawer_2 {
+  flex-grow: 1;
+  position: relative;
+  padding: 0 2vw;
+}
+.drawer .drawer_2 .info {
+  padding: 0 2vw;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+  padding: 0 !important;
+}
+

unpackage/dist/dev/mp-weixin/pagesAccount/vip/index.js

@@ -98,10 +98,51 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
 var components
+try {
+  components = {
+    uniForms: function () {
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 341))
+    },
+    uniFormsItem: function () {
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 354))
+    },
+    uniDataCheckbox: function () {
+      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 368))
+    },
+    uniEasyinput: function () {
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 361))
+    },
+  }
+} catch (e) {
+  if (
+    e.message.indexOf("Cannot find module") !== -1 &&
+    e.message.indexOf(".vue") !== -1
+  ) {
+    console.error(e.message)
+    console.error("1. 排查组件名称拼写是否正确")
+    console.error(
+      "2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
+    )
+    console.error(
+      "3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件"
+    )
+  } else {
+    throw e
+  }
+}
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var g0 = _vm.payForm.img_url && _vm.payForm.img_url.length > 0
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        g0: g0,
+      },
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -143,44 +184,27 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 35));
+var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 37));
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
+var cDrawer = function cDrawer() {
+  __webpack_require__.e(/*! require.ensure | pagesAccount/components/c-drawer */ "pagesAccount/components/c-drawer").then((function () {
+    return resolve(__webpack_require__(/*! ../components/c-drawer.vue */ 460));
+  }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
+};
+var upload = function upload() {
+  Promise.all(/*! require.ensure | components/upload/index */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/upload/index")]).then((function () {
+    return resolve(__webpack_require__(/*! @/components/upload/index.vue */ 319));
+  }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
+};
 var _default = {
+  components: {
+    cDrawer: cDrawer,
+    upload: upload
+  },
   data: function data() {
     return {
+      // 基本信息
+      basicInfo: {},
       // 用户信息
       userInfo: {},
       // vip信息
@@ -192,17 +216,73 @@ var _default = {
       // 用戶协议
       agree: true,
       // 修改用户信息
-      updateUser: {}
+      updateUser: {},
+      // 抽屉
+      drawer: {
+        title: '支付',
+        show: false,
+        mode: 'right'
+      },
+      // 支付信息
+      payForm: {
+        type: '0',
+        img_url: [],
+        pay_url: []
+      },
+      rules: {
+        pay_no: {
+          rules: [{
+            required: true,
+            errorMessage: '请输入转账单号/订单号'
+          }]
+        },
+        pay_url: {
+          rules: [{
+            required: false,
+            errorMessage: '请上传支付账单明细截图'
+          }]
+        }
+      },
+      // 支付方式
+      typeList: [{
+        "value": 0,
+        "text": "微信"
+      }, {
+        "value": 1,
+        "text": "支付宝"
+      }]
     };
   },
   onLoad: function onLoad() {
     var that = this;
+    // 查询基本信息
+    that.searchBasic();
     // 查询用户信息
     that.searchUser();
     // 查询其他信息
     that.searchOther();
   },
   methods: {
+    // 查询基本信息
+    searchBasic: function searchBasic() {
+      var that = this;
+      uni.getStorage({
+        key: 'basicInfo',
+        success: function success(res) {
+          var data = res.data;
+          data.account_btn = data.account_btn.sort(function (a, b) {
+            return a.sort - b.sort;
+          });
+          that.$set(that, "basicInfo", data);
+          // 支付方式默认值
+          that.typeChange({
+            detail: {
+              value: '0'
+            }
+          });
+        }
+      });
+    },
     // 查询用户信息
     searchUser: function searchUser() {
       var that = this;
@@ -304,52 +384,76 @@ var _default = {
       }
     },
     // 支付
-    oneBuy: function oneBuy(e) {
+    oneBuy: function oneBuy() {
       var that = this;
-      // uni.requestPayment--支付
-      uni.showModal({
+      that.$set(that, "drawer", {
         title: '支付',
-        content: "\u60A8\u786E\u8BA4\u8981\u652F\u4ED8".concat(e.money, "\u5143\u5417\uFF1F"),
-        success: function success(res) {
-          if (res.confirm) {
-            console.log('确认支付');
-            that.toPay(e);
-          } else if (res.cancel) {
-            console.log('取消支付');
-          }
-        }
+        show: true,
+        mode: 'right'
+      });
+    },
+    typeChange: function typeChange(e) {
+      var that = this;
+      var basicInfo = that.basicInfo;
+      var value = e.detail.value;
+      if (value == '0') that.$set(that.payForm, "img_url", basicInfo.pay_info.wx_url);else if (value == '1') that.$set(that.payForm, "img_url", basicInfo.pay_info.zfb_url);
+    },
+    // 图片保存
+    uplSuc: function uplSuc(e) {
+      var that = this;
+      that.$set(that.payForm, "".concat(e.name), [].concat((0, _toConsumableArray2.default)(that.payForm[e.name]), [e.data]));
+    },
+    // 图片删除
+    uplDel: function uplDel(e) {
+      var that = this;
+      var data = that.payForm[e.name];
+      var arr = data.filter(function (i, index) {
+        return index != e.data.index;
+      });
+      that.$set(that.payForm, "".concat(e.name), arr);
+    },
+    // 提交保存
+    toSave: function toSave() {
+      var that = this;
+      that.$refs.payForm.validate().then(function (res) {
+        that.toPay();
+      }).catch(function (err) {
+        console.log('表单错误信息：', err);
       });
     },
     // 确认支付
-    toPay: function toPay(e) {
+    toPay: function toPay() {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var that, updateUser, form, res;
+        var that, updateUser, form, payForm, object, res;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
                 that = _this; // 支付成功-修改个人信息，创建支付记录
                 updateUser = that.updateUser;
-                form = {
+                form = that.form;
+                payForm = that.payForm;
+                object = {
                   user_id: that.userInfo._id,
                   user_name: that.userInfo.nick_name,
                   money_no: 'NO' + that.$moment().valueOf(),
                   type: 'VIP',
                   create_time: that.$moment().format('YYYY-MM-DD HH:mm:ss'),
-                  money: e.money
+                  money: form.money,
+                  pay_no: payForm.pay_no
                 };
-                _context2.next = 5;
+                _context2.next = 7;
                 return that.$api("user/".concat(updateUser.id), 'POST', updateUser);
-              case 5:
+              case 7:
                 res = _context2.sent;
                 if (!(res.errcode == '0')) {
-                  _context2.next = 11;
+                  _context2.next = 13;
                   break;
                 }
-                _context2.next = 9;
-                return that.$api('moneylog', 'POST', form);
-              case 9:
+                _context2.next = 11;
+                return that.$api('moneylog', 'POST', object);
+              case 11:
                 res = _context2.sent;
                 if (res.errcode == '0') {
                   uni.showToast({
@@ -363,7 +467,7 @@ var _default = {
                     icon: 'error'
                   });
                 }
-              case 11:
+              case 13:
               case "end":
                 return _context2.stop();
             }
@@ -371,6 +475,15 @@ var _default = {
         }, _callee2);
       }))();
     },
+    // 关闭弹框
+    toClose: function toClose() {
+      var that = this;
+      that.$set(that, "drawer", {
+        title: '支付',
+        show: false,
+        mode: 'right'
+      });
+    },
     // 同意隐私协议
     changeAgree: function changeAgree() {
       var that = this;
@@ -409,17 +522,36 @@ var _default = {
                       money: res.data[0].money,
                       days: res.data[0].days
                     };
-                    console.log(form);
                     that.$set(that, "form", form);
                   }
                 }
-              case 5:
+                // 支付方式
+                _context3.next = 7;
+                return that.$api('dictdata', 'GET', {
+                  type: 'app_pay_type'
+                });
+              case 7:
+                res = _context3.sent;
+                if (res.errcode == '0') {
+                  that.$set(that, "typeList", res.data);
+                }
+              case 9:
               case "end":
                 return _context3.stop();
             }
           }
         }, _callee3);
       }))();
+    },
+    // 图片预览
+    imgView: function imgView(e) {
+      var that = this;
+      console.log(e);
+      console.log(e[0].url);
+      uni.previewImage({
+        current: 0,
+        urls: [e[0].url]
+      });
     }
   }
 };

unpackage/dist/dev/mp-weixin/pagesAccount/vip/index.json

@@ -1,5 +1,12 @@
 {
   "navigationBarTitleText": "vip",
   "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "c-drawer": "/pagesAccount/components/c-drawer",
+    "upload": "/components/upload/index"
+  }
 }

unpackage/dist/dev/mp-weixin/pagesAccount/vip/index.wxss

@@ -64,4 +64,27 @@
   margin: 0 0 2vw 0;
   color: var(--rgbfff);
 }
+.drawer_one .label {
+  font-size: 14px;
+  margin: 0 0 5px 0;
+  font-weight: bold;
+}
+.drawer_one .img {
+  width: 100%;
+  text-align: center;
+}
+.drawer_one .img .image {
+  width: 100%;
+}
+.drawer_one .uni-forms-item {
+  margin: 0;
+}
+.drawer_one .btn {
+  text-align: center;
+  margin: 30px 0 0 0;
+}
+.drawer_one .btn button {
+  background-color: var(--rgb67c);
+  color: var(--rgbfff);
+}
 

unpackage/dist/dev/mp-weixin/pagesHome/account/index.js

@@ -348,6 +348,12 @@ var _default = {
       });else if (e.type == '3') uni.switchTab({
         url: url
       });
+    },
+    // 拨打电话
+    toMark: function toMark(e) {
+      uni.makePhoneCall({
+        phoneNumber: e
+      });
     }
   }
 };

unpackage/dist/dev/mp-weixin/pagesHome/account/index.wxss

@@ -6,6 +6,7 @@
   height: 100vh;
 }
 .main {
+  position: relative;
   background-color: var(--rgb000);
   display: flex;
   flex-direction: column;
@@ -83,4 +84,12 @@
 .main .two .list:nth-child(4n) {
   margin: 0 0 10px 0;
 }
+.main .thr {
+  position: absolute;
+  width: 100%;
+  bottom: 5px;
+  text-align: center;
+  color: var(--rgbfff);
+  font-size: 14px;
+}