Merge branch 'dev-v1.0.0' of git.banshouhui.com:wuzhenzhe/study into dev-v1.0.0

src/pages.json

@@ -62,7 +62,10 @@
 					"path": "detail",
 					"name": "learnDetail",
 					"style": {
-						"navigationBarTitleText": "题库详情"
+						"navigationBarTitleText": "", // 题库详情
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": false,
+						"disableScroll": true
 					}
 				},
 				{
@@ -124,6 +127,16 @@
 						"enablePullDownRefresh": false,
 						"disableScroll": true
 					}
+				},
+				{
+					"path": "boundTest",
+					"name": "learnBoundTest",
+					"style": {
+						"navigationBarTitleText": "绑定试题",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": false,
+						"disableScroll": true
+					}
 				}
 			]
 		},

src/pages/learn/boundTest.vue

+<template>
+  <view class="bound-test">
+    <u-navbar
+      back-icon-color="#191C27"
+      background="transparent"
+      title="绑定试题"
+      titleColor="#191C27"
+      :border-bottom="false"
+      title-bold
+    ></u-navbar>
+    <view class="body-view">
+      <image class="image-view" :src="successImage"></image>
+      <view class="content-view">学习卡已绑定成功</view>
+      <view class="tip-view">可以前往首页进行答题或模拟考试学习</view>
+      <view class="bottom-view">
+        <u-button
+          :customStyle="buttonStyle"
+          @click="handleClick"
+          type="primary"
+          shape="circle"
+        >
+          去首页
+        </u-button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {}
+  },
+
+  computed: {
+    labels() {
+      return {
+        kemu: '考试科目',
+        tishu: '考试题数',
+        biaozhun: '合格标准',
+        guize: '出题规则',
+      }
+    },
+    successImage() {
+      return process.uniEnv.qn_base_url + 'shenqingtijiaochenggong.png'
+    },
+    buttonStyle() {
+      return {
+        height: '104rpx',
+        width: '400rpx',
+        backgroundColor: '#2953FF',
+        color: '#FFFFFF',
+        fontSize: '32rpx',
+        fontWeight: 'bold',
+      }
+    },
+  },
+  onLoad() {},
+  methods: {
+    handleClick() {
+      uni.switchTab({
+        url: '/pages/index/index',
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+  color: transparent;
+  display: none;
+}
+.bound-test {
+  display: flex;
+  flex-direction: column;
+  background-image: linear-gradient(to top, #f7f9fc 0%, #e9f3ff 50%);
+  background-color: #f7f9fc;
+  background-size: 100% 520rpx;
+  background-repeat: no-repeat;
+  height: 100vh;
+  .body-view {
+    height: 100%;
+    overflow: auto;
+    padding-top: 100rpx;
+    text-align: center;
+    .image-view {
+      margin-top: 100rpx;
+      width: 224rpx;
+      height: 224rpx;
+    }
+    .content-view {
+      font-size: 40rpx;
+      color: #2953ff;
+      font-weight: bold;
+    }
+    .tip-view {
+      font-size: 26rpx;
+      color: #9ea5bb;
+      margin-top: 10rpx;
+    }
+    .bottom-view {
+      margin-top: 180rpx;
+    }
+  }
+}
+</style>

src/pages/learn/detail copy.vue

+<template>
+  <view>
+    <u-button type="primary" @click="payOrder">微信支付测试</u-button>
+  </view>
+</template>
+
+<script>
+import md5 from '@/common/md5.js'
+export default {
+  components: {},
+  data() {
+    return {
+      lists: [
+        {
+          questionWarehouseId: 1,
+          amount: 0.01,
+          count: 1,
+        },
+      ],
+    }
+  },
+  methods: {
+    payOrder() {
+      const data = {
+        instrtutionId: 1,
+        orders: JSON.stringify(this.lists),
+        openId: this.openId,
+      }
+      this.$u.api.payOrder(data).then((res) => {
+        this.pay(res)
+      })
+    },
+    pay(data) {
+      const timeStamp = String(Date.now())
+      const paySign = md5
+        .hexMD5(
+          `appId=wxd1d6eede324b0465&nonceStr=${data.nonce_str}&package=prepay_id=${data.prepay_id}&signType=MD5&timeStamp=${timeStamp}&key=weixiuhui20151a2b3c4d5e6f7g8h9ij`
+        )
+        .toUpperCase()
+
+      uni.requestPayment({
+        provider: 'wxpay',
+        timeStamp: timeStamp,
+        nonceStr: data.nonce_str,
+        package: `prepay_id=${data.prepay_id}`,
+        signType: 'MD5',
+        paySign: paySign,
+        success: (res) => {
+          console.log('success:' + JSON.stringify(res))
+          this.checkPayStatus(data.out_trade_no)
+        },
+        fail: (err) => {
+          console.log('fail:' + JSON.stringify(err))
+          if (err.errMsg === 'requestPayment:fail cancel') {
+            this.$u.toast('取消支付')
+          } else {
+            this.checkPayStatus(data.out_trade_no)
+          }
+        },
+      })
+    },
+    checkPayStatus(no) {
+      const params = {
+        outTradeNo: no
+      }
+      this.$u.api.payQuery(params).then(res => {
+        if (res.trade_state === 'SUCCESS') {
+          this.$u.toast('支付成功')
+        } else if (res.trade_state === 'NOTPAY') {
+          this.$u.toast('请稍后核实订单状态，不要重复发起支付')
+        } else if (res.trade_state === 'PAYERROR') {
+         this.$u.toast('支付失败')
+        } else {
+          this.$u.toast(res.trade_state_desc)
+        }
+      })
+    }
+  },
+}
+</script>
+<style lang="scss" scoped></style>