完成下单

src/pages/everyday-donation/index.vue

@@ -61,7 +61,7 @@
             <button class="merit-button" @click="showSpec = true">去行善</button>
         </div>
 
-        <van-popup v-model="showSpec" position="bottom" closeable :style="{ height: 'auto' }" :close-on-click-overlay="false" :close-on-popstate="true">
+        <van-popup v-model="showSpec" position="bottom" closeable :style="{ height: 'auto' }" safe-area-inset-bottom :close-on-click-overlay="false" :close-on-popstate="true">
             <!-- 显示日行一善的商品规格 -->
             <div class="caret" v-if="query.goods_type == '1'">
                 <div class="head">
@@ -104,13 +104,13 @@
                 </div>
                 <ul class="spec brick-spec">
                     <li class="random">
-                        <span class="border-circle" :class="[is_assign && 'active']" @click="onCustomeBrike">自定义砖数认捐</span>
+                        <span class="border-circle" :class="[is_assign && 'active']" @click="onCustomeBrike">{{data.rule_btn}}</span>
                         <van-stepper v-model="buy_quantity" step="1" />
                     </li>
                     <li v-for="(spec, index) in data.spec" :key="index">
                         <span 
                             class="border-circle" 
-                            :class="[Number(spec.money) === priceUnit && 'active']" 
+                            :class="[Number(spec.money) === priceUnit && !is_assign &&  'active']"
                             @click="onPriceUnit(spec)"
                         >认捐{{spec.donate_number}}块砖 {{spec.money}}元</span>
                     </li>