08/10

src/main/vue/src/pages/OrderExamine.vue

@@ -729,7 +729,6 @@ export default {
                             data: {
                                 orderId: this.orderInfo.id,
                                 storeId: this.orderInfo.storeId,
-                                userId: this.orderInfo.userId
                             }
                         })
                         .then(res => {
@@ -766,7 +765,6 @@ export default {
                             data: {
                                 orderId: this.orderInfo.id,
                                 storeId: this.orderInfo.storeId,
-                                userId: this.orderInfo.userId
                             }
                         })
                         .then(res => {

src/main/vue/src/pages/OrderExamineAlbum.vue

@@ -3,8 +3,7 @@
         <template v-if="isFinish"></template>
         <template v-else>
             <div
-                 class="top"
-                 v-if="orderInfo.productInfo">
+                 class="top">
                 <el-radio-group
                                 v-model="radio1"
                                 v-if="hasXiutu"
@@ -15,7 +14,7 @@
                     <el-radio-button label="放大"></el-radio-button>
                 </el-radio-group>
                 <span>订单号:{{orderInfo.orderCode}}</span>
-                <span style="margin-left:20px;">{{orderInfo.productInfo.title}}</span>
+                <span style="margin-left:20px;">{{orderInfo.productName}}</span>
                 <template v-if="!isChange">
 
                     <el-button
@@ -135,13 +134,13 @@
                            layout="total, prev, pager, next"
                            :total="totalNumber"></el-pagination>
 
-            <div class="bottom">
+            <!-- <div class="bottom">
                 <el-button
                            type="warning"
                            v-if="!isChange"
                            plain
                            @click="goShare">他人审片</el-button>
-            </div>
+            </div> -->
         </template>
     </div>
 </template>
@@ -779,7 +778,6 @@ export default {
                                 data: {
                                     orderId: this.orderInfo.id,
                                     storeId: this.orderInfo.storeId,
-                                    userId: this.orderInfo.userId,
                                 },
                             })
                             .then(res => {
@@ -818,7 +816,6 @@ export default {
                                 data: {
                                     orderId: this.orderInfo.id,
                                     storeId: this.orderInfo.storeId,
-                                    userId: this.orderInfo.userId,
                                 },
                             })
                             .then(res => {

src/main/vue/src/pages/OrderUploadChangeAlbum.vue

@@ -1,12 +1,12 @@
 <template>
     <div class="container" v-loading='loading' element-loading-text="上传图片中，时间或许会很久，请耐心等待哦！">
-        <div class="top" v-if="orderInfo.productInfo">
+        <div class="top">
             <el-radio-group v-model="radio1" style="margin-right:10px;" size="mini" @change="changePage" v-if="hasXiutu">
                 <el-radio-button label="修图"></el-radio-button>
                 <el-radio-button label="放大"></el-radio-button>
             </el-radio-group>
             <span>订单号:{{orderInfo.orderCode}}</span>
-            <span style="margin-left:20px;">{{orderInfo.productInfo.title}}</span>
+            <span style="margin-left:20px;">{{orderInfo.productName}}</span>
             <el-button style="float:right;margin:15px 10px 0 20px;width:100px" v-if="!needAblum&&xiutuIsFull" type="primary" class="btn" @click="submit">提交</el-button>
             <el-select v-if="!isChange" size="mini" style="float:right;margin-top:25px;width:120px" clearable v-model="unFinished" placeholder="筛选状态" @change="getImage">
                 <el-option key="1" label="未上传" value="1">

src/main/vue/src/pages/ShoppingCart.vue

@@ -85,20 +85,6 @@ export default {
         ...mapState(['userInfo']),
     },
     methods: {
-        getActivityList(){
-              this.$http
-            .get({
-                url: '/activityInfo/getUsed',
-                data: {
-                    typeId: 6,
-                },
-            })
-            .then(res => {
-                if (res.data) {
-                    this.pointInfo = res.data;
-                }
-            });
-        },
         onSave() {
             this.$refs.form.validate(valid => {
                 if (valid) {