Merge branch 'feature/3月迭代-菜单' into feature/3月迭代

index.html

@@ -4,7 +4,8 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="shortcut icon" href="./static/img/favicon.ico">
-    <title>GIC后台</title>
+    <title></title>
+    <!-- <title>GIC后台</title> -->
     <link rel="stylesheet" type="text/css" href="<%= htmlWebpackPlugin.options.BASE_URL %>static/fonts/iconfont.css">
     <link rel="stylesheet" type="text/css" href="<%= htmlWebpackPlugin.options.BASE_URL %>static/css/common.css">
     <!-- <link rel="stylesheet" href="//at.alicdn.com/t/font_2996579_93aeeozj35q.css"> -->

src/assets/style/base/index.scss

@@ -9,7 +9,7 @@
 
 #app .dm-wrap{
   background:#FFF;
-  padding:24px;
+  padding:20px;
   // min-height: 500px;
 }
 #app .page-tip {
@@ -21,7 +21,7 @@
 }
 #app .dm-form__wrap{
   background:#FFF;
-  padding:20px 32px;
+  padding:20px;
   // min-height: 500px;
 }
 

src/components/libs/imgTextTemp/index.vue

 <template>
   <section :class="{ 'dm-wrap': auto }" v-loading="loading">
-    <div class="dm-imgtext__tip">
+    <div class="dm-imgtext__tip" v-if="!isPublish">
       <p class="dm-imgtext__tip-item">此处是同步【微信公众平台-草稿箱】中的图文类型草稿，点击“检查同步”可获取最新的草稿和草稿状态；</p>
       <p class="dm-imgtext__tip-item">若在微信公众后台对草稿有进行相关操作，请在此处“检查同步”以获取最新结果；</p>
+      <p class="dm-imgtext__tip-item">在此处对草稿进行“修改”/“发布”/“删除”操作，结果都会同步至微信公众平台对应的草稿上。</p>
     </div>
     <div class="dm-imgtext_head" :class="pbSize">
       <div>

src/router/index.js

@@ -48,7 +48,7 @@ router.beforeEach((to, from, next) => {
       next();
     });
 
-  document.title = to.name;
+  // document.title = to.name;
   // if (to.path != '/limit' && store.state.marketing.isLimit) {
   //   next({ path: '/limit' });
   // } else if (to.path == '/limit' && !store.state.marketing.isLimit) {

src/router/routes.js

@@ -41,7 +41,7 @@ export default [
     path: '/',
     name: 'layout',
     component: Layout,
-    redirect: '/wechat/record',
+    redirect: '/marketing-app-list',
     children: [
       {
         path: '/marketing-app-list',

src/views/card/form.vue

@@ -373,8 +373,8 @@
         </div>
         <div class="fz12 gray " v-else>* 仅支持选择账号管辖门店范围内的门店；</div>
         <!-- :readonly="isEdit"  -->
-        <!-- <vue-gic-store-card class="pt10" :readonly="isInfo" v-bind="storeParams" v-show="storeMode" ref="storeCard" :uuid.sync="uuid"></vue-gic-store-card> -->
-        <dm-store-selector v-if="isAdd ? storeMode : storeMode && !isAdd && uuid" :readonly="isInfo" v-bind="storeParams" ref="storeCard" :uuid.sync="uuid"></dm-store-selector>
+        <vue-gic-store-card class="pt10" :readonly="isInfo" v-bind="storeParams" v-show="storeMode" ref="storeCard" :uuid.sync="uuid"></vue-gic-store-card>
+        <!-- <dm-store-selector v-if="isAdd ? storeMode : storeMode && !isAdd && uuid" :readonly="isInfo" v-bind="storeParams" ref="storeCard" :uuid.sync="uuid"></dm-store-selector> -->
         <el-alert v-show="storeMode && form.cardApplyChannel.indexOf('WMmicroMall') !== -1" title="选择的门店必须保持与微盟侧门店一致，请确认选择无误" type="warning" show-icon :closable="false" class="mt20 width80"></el-alert>
       </el-form-item>
 

src/views/message/detail.vue

@@ -22,7 +22,7 @@
         </el-col>
         <el-col :span="8">
           <span class="primary-font-color">模板类型：</span>
-          <span class="regular-font-color">{{ info.sendType === 0 ? '普通短信' : '营销短信' }}</span>
+          <span class="regular-font-color">{{ info.type === 0 ? '普通短信' : '营销短信' }}</span>
         </el-col>
         <el-col :span="8" v-if="info.sceneSettingName">
           <span class="primary-font-color">营销场景：</span>

src/views/message/importSendDetail.vue

@@ -30,7 +30,7 @@
         </el-col>
         <el-col :span="8">
           <span class="primary-font-color">模板类型：</span>
-          <span class="regular-font-color">{{ info.sendType === 0 ? '普通短信' : '营销短信' }}</span>
+          <span class="regular-font-color">{{ info.type === 0 ? '普通短信' : '营销短信' }}</span>
         </el-col>
         <!-- <el-col :span="8">
           <span class="primary-font-color">营销场景：</span>