Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds

backendEle/src/views/ad/location.vue

@@ -11,7 +11,7 @@
         <el-table-column label="Type"> <!-- 类型 -->
           <template slot-scope="scope">
             <template v-if="scope.row.TYPE === '1'">
-              <el-tag type="success">幻灯</el-tag> <!-- 幻灯 -->
+              <el-tag type="success">Slideshow</el-tag> <!-- 幻灯 -->
             </template>
             <template v-else-if="scope.row.TYPE === '2'">
               <el-tag>Image</el-tag> <!-- 图片 -->