update: dist

index.html

@@ -11,8 +11,8 @@
     <!-- <link rel="stylesheet" href="//at.alicdn.com/t/font_2996579_93aeeozj35q.css"> -->
     <link rel="stylesheet" href="//at.alicdn.com/t/font_3229694_f4zx0uhc8y.css"> <!--GIC3.0营销-->
     <script src="//at.alicdn.com/t/font_3229694_f4zx0uhc8y.js"></script> <!--GIC3.0营销-->
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_2996579_875h3lycepk.css"> <!-- 3.0企业 -->
-    <script src="//at.alicdn.com/t/font_2996579_875h3lycepk.js"></script><!-- 3.0企业 -->
+    <link rel="stylesheet" href="//at.alicdn.com/t/font_2996579_1d7th3zc6it.css"> <!-- 3.0企业 -->
+    <script src="//at.alicdn.com/t/font_2996579_1d7th3zc6it.js"></script><!-- 3.0企业 -->
     <link src="//at.alicdn.com/t/font_2859043_udehp133w1.css"><!--3.0组件库-->
     <script src="//at.alicdn.com/t/font_2859043_udehp133w1.js"></script><!--3.0组件库-->
     <!-- <link rel="stylesheet" href="//web-1251519181.file.myqcloud.com/components/element.2.12.0.css"> -->

src/assets/style/base/reset.scss

@@ -253,6 +253,9 @@ a:hover {
 .w160{
   width: 160px!important;
 }
+.w180{
+  width: 180px !important;
+}
 .w200{
   width: 200px!important;
 }

src/views/game/cmh/base-config.vue

@@ -94,6 +94,9 @@
         </div>
       </el-form-item>
     </div>
+    <dm-form-bottom class="footer">
+      <el-button type="primary">保存并下一步</el-button>
+    </dm-form-bottom>
   </el-form>
 </template>
 
@@ -396,4 +399,7 @@ img {
 .dm-avatar__upload {
   background: #fff;
 }
+.footer {
+  width: calc(100% - 520px) !important;
+}
 </style>

src/views/game/cmh/form.vue

@@ -34,10 +34,8 @@
         </dm-steps>
         <div class="formContent">
           <baseConfig :templateArr="templateData" v-show="active == 0" @change="handleBaseConfigChange" />
+          <prizeConfig v-show="active == 1" />
         </div>
-        <dm-form-bottom class="footer">
-          <el-button type="primary">保存并下一步</el-button>
-        </dm-form-bottom>
       </div>
     </div>
   </div>
@@ -47,6 +45,7 @@
 import steps from '@/views/game/dm-steps/steps';
 import step from '@/views/game/dm-step/step';
 import baseConfig from './base-config.vue';
+import prizeConfig from './prize-config.vue';
 import { getGameTemplateByType } from '@/service/api/gameApi.js';
 import gameTemplate from './gameTemplate';
 export default {
@@ -76,7 +75,8 @@ export default {
     'dm-steps': steps,
     'dm-step': step,
     baseConfig,
-    gameTemplate
+    gameTemplate,
+    prizeConfig
   },
   mounted() {
     this.getGameTemplateByType();
@@ -231,8 +231,5 @@ export default {
     overflow-y: auto;
     height: 90%;
   }
-  .footer {
-    width: calc(100% - 520px) !important;
-  }
 }
 </style>

src/views/recharge/board.vue

@@ -134,6 +134,29 @@
             </div>
           </div>
         </el-col>
+        <el-col :span="6" style="padding: 0 2px">
+          <div class="recharge-today-item border2">
+            <div class="text-center">
+              <div class="icon-box color4">
+                <i class="iconfont icon-AIdianhua  fz36"></i>
+              </div>
+            </div>
+            <div class="consume-info">
+              <div class="consume-item">
+                <p class="consume-item-label">系统通知</p>
+                <p class="consume-item-value">
+                  <span class="value-content">{{ recharge.aiCount || 0 }}</span> 条
+                </p>
+              </div>
+              <div class="consume-item">
+                <p class="consume-item-label">合计费用</p>
+                <p class="consume-item-value">
+                  <span class="value-content">{{ (recharge.aiFee / 1000) | amount }}</span> 元
+                </p>
+              </div>
+            </div>
+          </div>
+        </el-col>
       </el-row>
     </div>
     <div class="dm-wrap" style="padding-top: 0">
@@ -325,7 +348,8 @@ export default {
             { name: '短信营销', type: 'marketing', fee: result.messageFee, count: result.messageCount },
             { name: '短信验证码', type: 'sms', fee: result.smsFee, count: result.smsCount },
             { name: '双向呼叫', type: 'call', fee: result.callFee, count: result.callTime },
-            { name: 'AI电话', type: 'ai-call', fee: result.aiFee, count: result.aiCount }
+            { name: 'AI电话', type: 'ai-call', fee: result.aiFee, count: result.aiCount },
+            { name: '系统通知', type: 'ai-voiceFee', fee: result.aiFee, count: result.aiCount }
           ];
         } else {
           this.recharge = res.result;

src/views/recharge/components/set-rule-dialog.vue

@@ -87,6 +87,15 @@
             <el-radio :label="3">活动创建人</el-radio>
           </el-radio-group>
         </el-form-item>
+        <h2 class="icon-type-title mb20">
+          <div class="mark" />
+          系统通知
+        </h2>
+        <el-form-item label="系统通知" prop="aiRule" class="mb20">
+          <el-radio-group v-model="form.jifei">
+            <el-radio :label="1">活动创建人</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </template>
     </el-form>
     <div class="footer">