Merge branch '03/18VipActive' into dev

src/views/service/GoodsSale.vue

@@ -384,7 +384,7 @@ export default {
       groupPrice: 0,
       obj: null,
       showPicker: false,
-      columns: ["教务代买", "创建订单"],
+      columns: ["老师代买", "创建订单"],
       orderType: null,
       orderText: null,
     };
@@ -560,21 +560,19 @@ export default {
           rows: 9999,
         }).then((res) => {
           let result = res.data;
-          if (result.code == 200) {
-            let tempArray = [
-              {
-                text: "全部",
-                value: "all",
-              },
-            ];
-            result.data.rows.forEach((row) => {
-              tempArray.push({
-                text: row.name,
-                value: row.id,
-              });
+          let tempArray = [
+            {
+              text: "全部",
+              value: "all",
+            },
+          ];
+          result.rows.forEach((row) => {
+            tempArray.push({
+              text: row.name,
+              value: row.id,
             });
-            this.option2 = tempArray;
-          }
+          });
+          this.option2 = tempArray;
         });
       } catch {
         //