待支付订单支付

src/components/buddha-process/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="process" v-if="privateData" @click="onProcessDetail">
+    <div class="buddha-process" v-if="privateData" @click="onProcessDetail">
         <span class="date">{{ privateData.time || privateData.date }}</span>
         <div class="process-detail">
             <h1 class="title">{{ privateData.title }}</h1>
@@ -83,7 +83,7 @@ export default {
 </script>
 
 <style lang="scss">
-.process {
+.buddha-process {
     display: flex;
     position: relative;
     padding: 0 0.4rem;
@@ -99,7 +99,7 @@ export default {
         bottom: 0;
         left: 0;
     }
-    & ~ .process {
+    & ~ .buddha-process {
         padding-top: 0.53rem;
     }
     .date {

src/components/fixed-bottom/index.vue

@@ -25,6 +25,7 @@ export default {
     right: 0;
     border-top: .01rem solid #ddd;
     background: white;
+    z-index: 100;
 }
 
 </style>

src/components/merit-desire/index.vue

@@ -4,8 +4,8 @@
         <div class="add-merit-name" >
             <h3 class="title">心愿</h3>
             <div class="desire-input">
-                <textarea class="desire-textarea" v-model="desire" type="text" maxlength="50" placeholder="请输入您的心愿" />
-                <span>{{desire.length}}/50</span>
+                <textarea class="desire-textarea" v-model="desire" type="text" :max-length="maxLength" placeholder="请输入您的心愿" />
+                <span>{{desire.length}}/{{maxLength}}</span>
             </div>
             <div class="desire-quike">
                 <div class="bar">
@@ -13,7 +13,7 @@
                     <span class="update" @click="getDreamList">换一组<i class="iconfont icon-shuaxin"></i></span>
                 </div>
                 <div class="name-group">
-                    <span class="name" v-for="(dream, index) in dreamList" :key="index" @click="desire = dream">{{dream}}</span>
+                    <span class="name" v-for="(dream, index) in dreamList" :key="index" @click="onFill(dream)">{{dream}}</span>
                 </div>
             </div>
             <button class="confirm" @click="onConfirmDream">确认</button>
@@ -31,11 +31,19 @@ export default {
             type: Boolean,
             default: false
         },
+        mode: {
+            type: String,
+            default: 'increment', // increment | single
+        },
         selected: {
             type: Array,
             default(){
                 return []
             }
+        },
+        maxLength: {
+            type: Number,
+            default: 50
         }
     },
     data() {
@@ -56,6 +64,13 @@ export default {
         this.getDreamList();
     },
     methods: {
+        onFill(dream){
+            if(this.mode === 'single'){
+                return this.desire = dream;
+            }
+            this.desire += dream + '，';
+            this.desire = this.desire.slice(0, this.maxLength)
+        },
         onClose() {
             this.$emit('update:visible', false);
         },
@@ -159,6 +174,7 @@ export default {
             padding: .25rem;
             height: 2rem;
             resize: none;
+            line-height: 1.4;
         }
 
         span {

src/components/merit-goods/index.vue

@@ -1,11 +1,11 @@
 <template>
-  <div class="merit-goods">
+  <div class="merit-goods" @click="onJoin">
       <img  class="goods" :src="data.cover_url" alt="">
       <div class="info">
           <h3 class="title">{{data.title}}</h3>
           <div class="bar">
               <span class="join-number">已有{{data.sales}}人参与</span>
-              <button class="join" @click="onJoin">参与</button>
+              <button class="join" >参与</button>
           </div>
       </div>
   </div>
@@ -21,7 +21,7 @@ export default {
                 name: 'goods-detail',
                 query: {
                     goods_id: this.data.id,
-                    temple_id: this.$route.query.temple_id
+                    temple_id: this.data.temple_id
                 }
             })
         }

src/components/order/index.vue

@@ -1,7 +1,7 @@
 <template>
-    <div class="order">
+    <div class="order" @click="handleOrder">
         <div class="order-head">
-            <span class="temple-name" @click="onTemple">{{data.temple_name}}<i class="iconfont icon-arrow-right"></i></span>
+            <span class="temple-name" @click.stop="onTemple">{{data.temple_name}}<i class="iconfont icon-arrow-right"></i></span>
             <span class="status">{{data.status}}</span>
         </div>
         <div class="order-body">
@@ -25,6 +25,20 @@ export default {
     methods: {
         onTemple(){
             this.$router.push({ name: 'temple-home', query: { temple_id: this.data.temple_id} })
+        },
+        handleOrder(){
+            if(this.data.status === '待支付'){
+                this.$router.push({
+                    name: 'pay',
+                    query: {
+                        order_id: this.data.id,
+                        title: this.data.goods_name,
+                        subTitle: this.data.spec_name,
+                        quantity: this.data.buy_total,
+                        amount: this.data.order_amount
+                    }
+                })
+            }
         }
     }
 }

src/components/uploader/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <van-uploader class="custom-uploader" v-bind="$attrs"  v-model="fileList" :after-read="onBeforeUpload"></van-uploader>
+  <van-uploader class="custom-uploader" v-bind="$attrs" :max-count="maxCount"  v-model="fileList" :after-read="onBeforeUpload"></van-uploader>
   <!-- <van-uploader class="custom-uploader" v-bind="$attrs" :max-size="isOverSize" :max-count="maxCount"  v-model="fileList" @oversize="onOversize" :after-read="onBeforeUpload"></van-uploader> -->
 </template>