Merge branch 'securityFund' into test

src/views/system/order/index.vue

@@ -162,9 +162,9 @@
               </el-table-column>
               <el-table-column label="规格/数量/金额" align="center">
                 <template slot-scope="scope">
-                  {{ scope.row.goods_option_title }}<br/>
-                  {{ scope.row.goods_price / 100 }} 元<br/>
-                  x {{ scope.row.total }}<br/>
+                  {{ scope.row.goods_option_title ? scope.row.goods_option_title : '--' }}<br/>
+                  x {{ scope.row.total ? scope.row.total : '--' }}<br/>
+                  {{ scope.row.goods_price / 100 ? scope.row.goods_price / 100 : '--' }} 元<br/>
                 </template>
               </el-table-column>
               <el-table-column prop="created_time" label="下单时间" width="180" align="center">