待支付订单支付

src/pages/goods-detail/index.vue

@@ -43,9 +43,9 @@
                 <div class="head">
                     <span>参与流程： </span>
                     <ul class="step-inline">
-                        <li :class="[ current === 0 && 'current']" @click="current = 0">选择类型</li>
-                        <li :class="[ current === 1 && 'current']" @click="current = 1">填写信息</li>
-                        <li :class="[ current === 2 && 'current']" >参与成功</li>
+                        <li :class="[ current === 0 && 'current']">选择类型</li>
+                        <li :class="[ current === 1 && 'current']">填写信息</li>
+                        <li :class="[ current === 2 && 'current']">参与成功</li>
                     </ul>
                 </div>
                 <transition>
@@ -55,7 +55,7 @@
                     </template>
                 </transition>
                 <div class="next-group">
-                    <span class="total">合计：￥{{priceTotal}}</span>
+                    <span class="total">合计：<em>￥{{priceTotal}}</em></span>
                     <button class="next" @click="onNextStep">下一步</button>
                 </div>
             </div>
@@ -139,7 +139,7 @@ export default {
         // 接收随喜金额
         onReceiveAnyAmount(anyObj){
             this.anyPrice = anyObj.money;
-            this.onNextStep();
+            this.onToFillMeritName();
         },
         // dreamInfo: 心愿信息
         onDreamInfoChange(dreamInfo){
@@ -158,34 +158,35 @@ export default {
                 return;
             }
 
-            this.current += 1;
-
-            if(this.current === 1 && this.spec_id === 'is_customized'){
+            if( this.spec_id === 'is_customized'){
                 this.showAnyAmount = true;
                 return ;
             }
-            const selectedSpec = this.getSelectedSpec();
+
+            this.current += 1;
 
             if(this.current > 0){
-                this.$router.push({
-                    name: 'fill-name',
-                    query: {
-                        ...this.query,
-                        is_auto: this.is_auto ? 1 : 0,
-                        spec_id: selectedSpec.id,
-                        friendly_time: this.number,
-                        quantity: this.quantity,
-                        title: this.data.name,
-                        subTitle: selectedSpec.spec_name,
-                        amount: this.priceTotal,
-                        // merit_name_id: ,
-                        is_customized: 0,
-                        from: 'common_goods', // 标识为通用商品
-                    }
-                })
-
+                this.onToFillMeritName();
             }
         },
+        onToFillMeritName(){
+            const selectedSpec = this.getSelectedSpec();
+            this.$router.push({
+                name: 'fill-name',
+                query: {
+                    ...this.query,
+                    is_auto: this.is_auto ? 1 : 0,
+                    spec_id: selectedSpec.id,
+                    friendly_time: this.number,
+                    quantity: this.quantity,
+                    title: this.data.name,
+                    subTitle: selectedSpec.spec_name,
+                    amount: this.priceTotal,
+                    is_customized: this.spec_id === 'is_customized' ? 1 : 0,
+                    from: 'common_goods', // 标识为通用商品
+                }
+            })
+        },
         async getGoodsDetail(type){
             const { goods_id, temple_id } = this.$route.query;
             const response = await getGoodsDetail(type, goods_id, temple_id);
@@ -370,6 +371,11 @@ export default {
             border-top: 1px solid #ededed;
             .total{
                 font-size: .4rem;
+                em{
+                    color: $primary-color;
+                    font-size: .4rem;
+                    font-weight: bold;
+                }
             }
             .next{
                 font-size: .4rem;