news

src/views/InquireTransform/index.vue

@@ -128,13 +128,15 @@
           <el-table-column prop="inquiry_brand_name" label="更新时间" :show-overflow-tooltip="true" width="160"></el-table-column>
           <el-table-column prop="inquiry_brand_name" label="上架有效期" :show-overflow-tooltip="true" width="160"></el-table-column>
         </el-table>
-        <el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
-        <p class="tetx-goods">
+        <div class="row bothSide">
+          <p class="tetx-goods row verCenter">
             <span>上传型号总数：</span><em>162512</em>
             <span>参与询价型号总数：</span><em>162512</em>
             <span>参与报价型号总数：</span><em>162512</em>
             <span>成单型号总数：</span><em>162512</em>
           </p>
+          <el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
+        </div>
       </div>
     </div>
     <Menu/>
@@ -282,8 +284,9 @@ export default {
 </script>
 <style scoped lang="less">
 .tetx-goods {
-  position: absolute;
-  bottom: 14px;
+  font-size: 12px;
+  margin-top: 20px;
+  flex-wrap: wrap;
 
   span {
     color: #F59A23;

src/views/News/notice.vue

@@ -13,27 +13,6 @@
       </div>
     </div>
     <Menu/>
-    <el-dialog title="消息详情" :close-on-click-modal="false" :visible.sync="dialogVisible" width="1000px">
-      <el-descriptions size="medium" border :column="2">
-        <el-descriptions-item>
-          <template slot="label">发件人</template>
-          {{ msgDetail.sender }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">收件人</template>
-          {{ msgDetail.recipient }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">时间</template>
-          {{ msgDetail.create_time }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">大小</template>
-          {{ msgDetail.size }}
-        </el-descriptions-item>
-      </el-descriptions>
-      <p style="margin-top: 20px;padding-bottom: 10px;">{{ msgDetail.content }}</p>
-    </el-dialog>
   </section>
 </template>
 <script>
@@ -63,13 +42,7 @@ export default {
   },
   methods: {
     getData() {
-      var params = Object.assign({},
-          {page: this.page, limit: this.limit},
-          this.formParam,
-          {start_time: this.formParam.date ? this.formParam.date[0] : ''},
-          {end_time: this.formParam.date ? this.formParam.date[1] : ''}
-      );
-      this.$http('GET', "/api/message/getMsgList", params).then(res => {
+      this.$http('GET', "/api/message/getMsgList", {}).then(res => {
         if (res.code === 0) {
           this.list = res.data.list || [];
           this.total = Number(res.data.total) || 0;

src/views/OrderTrack/goods.vue

@@ -138,9 +138,15 @@
             </template>
           </el-table-column>
         </el-table>
+        <div class="row bothSide">
+          <p class="tetx-goods row verCenter">
+            <span>订单总金额：</span>
+            <em>￥{{ total_amount }}</em>
+          </p>
           <el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
         </div>
       </div>
+    </div>
     <Menu/>
     <el-dialog title="已采购订单日志" :close-on-click-modal="false" :visible.sync="dialogVisible" width="1000px">
       <el-table :data="logs" border max-height="600">
@@ -163,6 +169,7 @@ export default {
   name: "orderTrackGoods",
   data() {
     return {
+      total_amount: '',//订单总金额
       total: 0,
       limit: 10,
       page: 1,
@@ -206,6 +213,7 @@ export default {
         if (res.code === 0) {
           this.tableData = res.data.list || [];
           this.total = Number(res.data.total) || 0;
+          this.total_amount = res.data.total_amount;
         } else {
           this.$message({
             message: res.msg,
@@ -340,6 +348,23 @@ export default {
   }
 };
 </script>
-<style scoped>
+<style scoped lang="less">
 @import "../../assets/css/goods/goods.min.css";
+
+.tetx-goods {
+  font-size: 12px;
+  margin-top: 20px;
+  flex-wrap: wrap;
+
+  span {
+    color: #333;
+    font-weight: bold;
+  }
+
+  em {
+    color: #FF0000;
+    font-weight: bold;
+    margin-right: 15px;
+  }
+}
 </style>
\ No newline at end of file